From 9bacd09cc5280924908fc4bba494856bbe37c47f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 4 Dec 2009 21:37:01 +0100
Subject: some more additions for gtk+ library porting

---
 package/zlib/Makefile | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'package/zlib')

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 1f0e11ef6..cf4edff8d 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		zlib
 PKG_VERSION:=		1.2.3
 PKG_RELEASE:=		6
 PKG_MD5SUM:=		dee233bf288ee795ac96a98cc2e369b6
-PKG_DESCR:=		implementation of the deflate compression method (library)
+PKG_DESCR:=		implementation of the deflate compression method
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.zlib.net
 PKG_SITES:=		http://www.zlib.net/ \
@@ -15,29 +15,37 @@ PKG_SITES:=		http://www.zlib.net/ \
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	manual
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+CONFIGURE_STYLE:=	manual
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+ifeq ($(ADK_NATIVE),n)
+COPTS:=                 $(TARGET_CONFIGURE_OPTS)
+endif
 
-ifeq ($(ADK_NATIVE),n)                                                              
-COPTS:=                 $(TARGET_CONFIGURE_OPTS)    
+ifeq ($(ADK_STATIC),n)
+CONFIGURE_OPTS:=	--shared
 endif
 
 do-configure:
-		(cd $(WRKBUILD); $(COPTS) \
-			CFLAGS="$(TARGET_CFLAGS) -fPIC" \
-			CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-			LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-			./configure \
-			--prefix=$(STAGING_DIR)/usr \
-			--includedir=$(STAGING_DIR)/usr/include \
-			--shared \
-		);
+	(cd $(WRKBUILD); $(COPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		./configure \
+		--prefix=$(STAGING_DIR)/usr \
+		--includedir=$(STAGING_DIR)/usr/include \
+		$(CONFIGURE_OPTS) \
+	);
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
-- 
cgit v1.2.3