diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-10-02 22:53:28 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-10-02 22:53:28 +0000 |
| commit | 449e5b8c17e7f97f3f1848abc146027236ddb979 (patch) | |
| tree | 8dcdef9382bd930509febc4390d6fb360f62e721 /rules/libpng.make | |
| parent | f2984e348d4eff9a7abbe7ae8914c793b63a6d81 (diff) | |
| download | ptxdist-449e5b8c17e7f97f3f1848abc146027236ddb979.tar.gz ptxdist-449e5b8c17e7f97f3f1848abc146027236ddb979.tar.xz | |
* libpng: version bump; backport from TechPool
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7337 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libpng.make')
| -rw-r--r-- | rules/libpng.make | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/rules/libpng.make b/rules/libpng.make index 3b0723751..39e09e28b 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.2.8 -LIBPNG := libpng-$(LIBPNG_VERSION)-config -LIBPNG_SUFFIX := tar.gz +LIBPNG_VERSION := 1.2.18 +LIBPNG := libpng-$(LIBPNG_VERSION) +LIBPNG_SUFFIX := tar.bz2 LIBPNG_URL := $(PTXCONF_SETUP_SFMIRROR)/libpng/$(LIBPNG).$(LIBPNG_SUFFIX) LIBPNG_SOURCE := $(SRCDIR)/$(LIBPNG).$(LIBPNG_SUFFIX) LIBPNG_DIR := $(BUILDDIR)/$(LIBPNG) @@ -32,7 +32,7 @@ LIBPNG_DIR := $(BUILDDIR)/$(LIBPNG) libpng_get: $(STATEDIR)/libpng.get -$(STATEDIR)/libpng.get: $(libpng_get_deps_default) +$(STATEDIR)/libpng.get: @$(call targetinfo, $@) @$(call touch, $@) @@ -46,7 +46,7 @@ $(LIBPNG_SOURCE): libpng_extract: $(STATEDIR)/libpng.extract -$(STATEDIR)/libpng.extract: $(libpng_extract_deps_default) +$(STATEDIR)/libpng.extract: @$(call targetinfo, $@) @$(call clean, $(LIBPNG_DIR)) @$(call extract, LIBPNG) @@ -61,9 +61,13 @@ libpng_prepare: $(STATEDIR)/libpng.prepare LIBPNG_PATH := PATH=$(CROSS_PATH) LIBPNG_ENV := $(CROSS_ENV) + +# +# autoconf +# LIBPNG_AUTOCONF := $(CROSS_AUTOCONF_USR) -$(STATEDIR)/libpng.prepare: $(libpng_prepare_deps_default) +$(STATEDIR)/libpng.prepare: @$(call targetinfo, $@) @$(call clean, $(LIBPNG_BUILDDIR)) cd $(LIBPNG_DIR) && \ @@ -77,9 +81,9 @@ $(STATEDIR)/libpng.prepare: $(libpng_prepare_deps_default) libpng_compile: $(STATEDIR)/libpng.compile -$(STATEDIR)/libpng.compile: $(libpng_compile_deps_default) +$(STATEDIR)/libpng.compile: @$(call targetinfo, $@) - cd $(LIBPNG_DIR) && $(LIBPNG_PATH) make + cd $(LIBPNG_DIR) && $(LIBPNG_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -88,7 +92,7 @@ $(STATEDIR)/libpng.compile: $(libpng_compile_deps_default) libpng_install: $(STATEDIR)/libpng.install -$(STATEDIR)/libpng.install: $(libpng_install_deps_default) +$(STATEDIR)/libpng.install: @$(call targetinfo, $@) @$(call install, LIBPNG) $(INSTALL) -m 755 -D $(LIBPNG_DIR)/libpng-config $(PTXCONF_CROSS_PREFIX)/bin/libpng-config @@ -101,7 +105,7 @@ $(STATEDIR)/libpng.install: $(libpng_install_deps_default) libpng_targetinstall: $(STATEDIR)/libpng.targetinstall -$(STATEDIR)/libpng.targetinstall: $(libpng_targetinstall_deps_default) +$(STATEDIR)/libpng.targetinstall: @$(call targetinfo, $@) @$(call install_init, libpng) @@ -114,16 +118,10 @@ $(STATEDIR)/libpng.targetinstall: $(libpng_targetinstall_deps_default) @$(call install_fixup, libpng,DESCRIPTION,missing) @$(call install_copy, libpng, 0, 0, 0644, \ - $(LIBPNG_DIR)/.libs/libpng12.so.0.0.0, \ - /usr/lib/libpng12.so.0.0.0) - @$(call install_link, libpng, libpng12.so.0.0.0, /usr/lib/libpng12.so.0.0) - @$(call install_link, libpng, libpng12.so.0.0.0, /usr/lib/libpng12.so.0) - - @$(call install_copy, libpng, 0, 0, 0644, \ - $(LIBPNG_DIR)/.libs/libpng.so.3.0.0, \ - /usr/lib/libpng.so.3.0.0) - @$(call install_link, libpng, libpng.so.3.0.0, /usr/lib/libpng.so.3.0) - @$(call install_link, libpng, libpng.so.3.0.0, /usr/lib/libpng.so.3) + $(LIBPNG_DIR)/.libs/libpng12.so.0.18.0, \ + /usr/lib/libpng12.so.0.18.0) + @$(call install_link, libpng, libpng12.so.0.18.0, /usr/lib/libpng12.so.0) + @$(call install_link, libpng, libpng12.so.0.18.0, /usr/lib/libpng12.so) @$(call install_finish, libpng) |