diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-12 22:44:35 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-12 22:44:35 +0000 |
| commit | 20611fd5587c821f99bae72e96460bd70120a99e (patch) | |
| tree | 73c03e674b51f9ce59d701d78951a27e82ce8d40 /rules/poppler.make | |
| parent | 54e88c909923d4b8de81cb402af2c77efa5f0b7f (diff) | |
| download | ptxdist-20611fd5587c821f99bae72e96460bd70120a99e.tar.gz ptxdist-20611fd5587c821f99bae72e96460bd70120a99e.tar.xz | |
* poppler.make:
cleanups
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9511 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/poppler.make')
| -rw-r--r-- | rules/poppler.make | 78 |
1 files changed, 14 insertions, 64 deletions
diff --git a/rules/poppler.make b/rules/poppler.make index f6c9eb810..448ccd246 100644 --- a/rules/poppler.make +++ b/rules/poppler.make @@ -19,53 +19,35 @@ PACKAGES-$(PTXCONF_POPPLER) += poppler # POPPLER_VERSION := 0.6.2 POPPLER := poppler-$(POPPLER_VERSION) -POPPLER_SUFFIX := tar.gz -POPPLER_URL := http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX) -POPPLER_SOURCE := $(SRCDIR)/$(POPPLER).$(POPPLER_SUFFIX) -POPPLER_DIR := $(BUILDDIR)/$(POPPLER) +POPPLER_SUFFIX := tar.gz +POPPLER_URL := http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX) +POPPLER_SOURCE := $(SRCDIR)/$(POPPLER).$(POPPLER_SUFFIX) +POPPLER_DIR := $(BUILDDIR)/$(POPPLER) # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- -poppler_get: $(STATEDIR)/poppler.get - -$(STATEDIR)/poppler.get: $(poppler_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(POPPLER_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, POPPLER) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -poppler_extract: $(STATEDIR)/poppler.extract - -$(STATEDIR)/poppler.extract: $(poppler_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(POPPLER_DIR)) - @$(call extract, POPPLER) - @$(call patchin, POPPLER) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -poppler_prepare: $(STATEDIR)/poppler.prepare - POPPLER_PATH := PATH=$(CROSS_PATH) POPPLER_ENV := $(CROSS_ENV) # # autoconf # -POPPLER_AUTOCONF := $(CROSS_AUTOCONF_USR) -POPPLER_AUTOCONF += --disable-abiword-output --disable-poppler-qt \ - --disable-poppler-qt4 --disable-gtk-test +POPPLER_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --disable-abiword-output \ + --disable-poppler-qt \ + --disable-poppler-qt4 \ + --disable-gtk-test ifdef PTXCONF_POPPLER_X POPPLER_AUTOCONF += --with-x @@ -103,44 +85,12 @@ else POPPLER_AUTOCONF += --disable-poppler-glib endif -$(STATEDIR)/poppler.prepare: $(poppler_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(POPPLER_DIR)/config.cache) - cd $(POPPLER_DIR) && \ - $(POPPLER_PATH) $(POPPLER_ENV) \ - ./configure $(POPPLER_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -poppler_compile: $(STATEDIR)/poppler.compile - -$(STATEDIR)/poppler.compile: $(poppler_compile_deps_default) - @$(call targetinfo, $@) - cd $(POPPLER_DIR) && $(POPPLER_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -poppler_install: $(STATEDIR)/poppler.install - -$(STATEDIR)/poppler.install: $(poppler_install_deps_default) - @$(call targetinfo, $@) - @$(call install, POPPLER) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -poppler_targetinstall: $(STATEDIR)/poppler.targetinstall - -$(STATEDIR)/poppler.targetinstall: $(poppler_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/poppler.targetinstall: + @$(call targetinfo) @$(call install_init, poppler) @$(call install_fixup, poppler,PACKAGE,poppler) @@ -171,7 +121,7 @@ endif @$(call install_finish, poppler) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |