From 3544d8f71e754f623d2f7c7c0fe5b10a6d88cf63 Mon Sep 17 00:00:00 2001
From: Daniel Laird <danieljlaird@hotmail.com>
Date: Wed, 29 Oct 2008 12:49:38 +0000
Subject: package/libpng/libpng.mk: Change to autotools.in format

Move libpng into the new era.....

Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
---
 package/libpng/libpng.mk | 89 +++++++-----------------------------------------
 1 file changed, 13 insertions(+), 76 deletions(-)

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 122b65914..714b7c3aa 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -3,93 +3,30 @@
 # libpng (Portable Network Graphic library)
 #
 #############################################################
-# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-
 LIBPNG_VERSION:=1.2.32
-LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VERSION)
-LIBPNG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
-LIBPNG_SOURCE:=libpng-$(LIBPNG_VERSION).tar.bz2
-LIBPNG_CAT:=$(BZCAT)
-
-$(DL_DIR)/$(LIBPNG_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(LIBPNG_SITE)/$(LIBPNG_SOURCE)
-
-libpng-source: $(DL_DIR)/$(LIBPNG_SOURCE)
-
-$(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE)
-	$(LIBPNG_CAT) $(DL_DIR)/$(LIBPNG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBPNG_DIR) package/libpng/ libpng\*.patch
-	$(CONFIG_UPDATE) $(LIBPNG_DIR)
-	touch $@
-
-$(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked
-	(cd $(LIBPNG_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
+LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_LIBTOOL_PATCH = NO
+LIBPNG_INSTALL_STAGING = YES
+LIBPNG_INSTALL_TARGET = YES
+LIBPNG_CONF_ENV = \
 		ac_cv_have_decl_malloc=yes \
 		gl_cv_func_malloc_0_nonnull=yes \
 		ac_cv_func_malloc_0_nonnull=yes \
 		ac_cv_func_calloc_0_nonnull=yes \
-		ac_cv_func_realloc_0_nonnull=yes \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
+		ac_cv_func_realloc_0_nonnull=yes
+LIBPNG_CONF_OPT = \
 		--without-libpng-compat \
-		--without-x \
-	)
-	touch $@
+		--without-x
+LIBPNG_DEPENDENCIES = uclibc pkgconfig zlib
 
-$(LIBPNG_DIR)/.compiled: $(LIBPNG_DIR)/.configured
-	$(MAKE) -C $(LIBPNG_DIR)
-	touch $@
+$(eval $(call AUTOTARGETS,package,libpng))
 
-$(STAGING_DIR)/usr/lib/libpng.so: $(LIBPNG_DIR)/.compiled
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBPNG_DIR) install
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libpng12.la
+$(LIBPNG_HOOK_POST_INSTALL):
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
 		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
 		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng12\',g" \
 		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
 		$(STAGING_DIR)/usr/bin/libpng12-config
-	touch -c $@
-
-$(TARGET_DIR)/usr/lib/libpng.so: $(STAGING_DIR)/usr/lib/libpng.so
-	cp -dpf $(STAGING_DIR)/usr/lib/libpng*.so* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libpng*
-
-png libpng: uclibc zlib pkgconfig $(TARGET_DIR)/usr/lib/libpng.so
-
-libpng-clean:
-	-$(MAKE) -C $(LIBPNG_DIR) clean
-
-libpng-dirclean:
-	rm -rf $(LIBPNG_DIR)
+	touch $@
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIBPNG)),y)
-TARGETS+=libpng
-endif
-- 
cgit v1.2.3