diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-05-20 08:03:44 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-05-20 08:03:44 +0000 |
| commit | 3d3088ff5e1a1400cfb6093c087b93e86015eff4 (patch) | |
| tree | 16178c45e319d2d517ef1890530832d45f6310fa /rules/libpng.make | |
| parent | f40341fb631711c05d4a10ae15b4bd6bb789e3f5 (diff) | |
| download | ptxdist-3d3088ff5e1a1400cfb6093c087b93e86015eff4.tar.gz ptxdist-3d3088ff5e1a1400cfb6093c087b93e86015eff4.tar.xz | |
[libpng] cleanups + version bump to 1.2.36
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10547 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libpng.make')
| -rw-r--r-- | rules/libpng.make | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/rules/libpng.make b/rules/libpng.make index 6cb4940f1..09c9a622a 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -3,6 +3,7 @@ # # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de> # Pengutronix <info@pengutronix.de>, Germany +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -18,13 +19,12 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.2.34 +LIBPNG_VERSION := 1.2.36 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) -LIBPNG_PKGDIR := $(PKGDIR)/$(LIBPNG) # ---------------------------------------------------------------------------- # Get @@ -46,7 +46,7 @@ LIBPNG_ENV := $(CROSS_ENV) # LIBPNG_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --with-libpng-compat + --without-libpng-compat # ---------------------------------------------------------------------------- # Install @@ -55,17 +55,8 @@ LIBPNG_AUTOCONF := \ $(STATEDIR)/libpng.install: @$(call targetinfo) @$(call install, LIBPNG) - $(INSTALL) -m 755 -D $(LIBPNG_DIR)/libpng-config $(PTXCONF_SYSROOT_CROSS)/bin/libpng-config $(INSTALL) -m 755 -D $(LIBPNG_DIR)/libpng12-config $(PTXCONF_SYSROOT_CROSS)/bin/libpng12-config - -# -# remove library version 3, we don't install it on the target -# so we can't install it in SYSROOT, too -# - for dir in "$(LIBPNG_PKGDIR)" "$(SYSROOT)"; do \ - rm -v "$$dir/usr/lib/libpng.so.3"*; \ - done - + ln -sf libpng12-config $(PTXCONF_SYSROOT_CROSS)/bin/libpng-config @$(call touch) # ---------------------------------------------------------------------------- @@ -84,11 +75,10 @@ $(STATEDIR)/libpng.targetinstall: @$(call install_fixup, libpng,DEPENDS,) @$(call install_fixup, libpng,DESCRIPTION,missing) - @$(call install_copy, libpng, 0, 0, 0644, \ - $(LIBPNG_DIR)/.libs/libpng12.so.0.34.0, \ - /usr/lib/libpng12.so.0.34.0) - @$(call install_link, libpng, libpng12.so.0.34.0, /usr/lib/libpng12.so.0) - @$(call install_link, libpng, libpng12.so.0.34.0, /usr/lib/libpng12.so) + @$(call install_copy, libpng, 0, 0, 0644, -, \ + /usr/lib/libpng12.so.0.36.0) + @$(call install_link, libpng, libpng12.so.0.36.0, /usr/lib/libpng12.so.0) + @$(call install_link, libpng, libpng12.so.0.36.0, /usr/lib/libpng12.so) @$(call install_finish, libpng) |