allow building of kernel-specific stuff in package/ instead of target/linux/package...

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 2f3bd8c..33cbcce 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -3,32 +3,40 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib

-PKG_VERSION:=1.2.2
-PKG_RELEASE:=2
-PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=3

 
 

-PKG_SOURCE_URL:=@SF/zlib
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

+PKG_SOURCE_URL:=http://www.zlib.net \
+       @SF/zlib
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6

 PKG_CAT:=bzcat
 
 PKG_CAT:=bzcat
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 

-$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/zlib
+SECTION:=base
+CATEGORY:=Libraries
+TITLE:=Library implementing the deflate compression method
+DESCRIPTION:=A library implementing the 'deflate' compression method
+URL:=http://www.zlib.net/
+endef

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+define Build/Configure

        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \

+               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \

                ./configure \
                --prefix=/usr \
                --shared \
        );
                ./configure \
                --prefix=/usr \
                --shared \
        );

-       touch $@
+endef

 
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+define Build/Compile

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \


@@ -37,27 +45,29 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install

-       touch $@
+endef

 
 

-$(IPKG_ZLIB):
-       install -m0755 -d $(IDIR_ZLIB)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
-       $(RSTRIP) $(IDIR_ZLIB)
-       $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
+define Package/zlib/install
+       install -m0755 -d $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
+endef

 
 

-$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev

        mkdir -p $(STAGING_DIR)/usr/include
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include
+       $(CP)   $(PKG_INSTALL_DIR)/usr/include/zconf.h \
+               $(PKG_INSTALL_DIR)/usr/include/zlib.h \
+               $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib
-       touch $(STAGING_DIR)/usr/lib/libz.so
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.a \
+               $(PKG_INSTALL_DIR)/usr/lib/libz.so* \
+               $(STAGING_DIR)/usr/lib/
+endef

        
        

-install-dev: $(STAGING_DIR)/usr/lib/libz.so
-
-uninstall-dev:
-       rm -rf $(STAGING_DIR)/usr/include/zconf.h
-       rm -rf $(STAGING_DIR)/usr/include/zlib.h
-       rm -rf $(STAGING_DIR)/usr/lib/libz.*
+define Build/UninstallDev
+       rm -rf  $(STAGING_DIR)/usr/include/zconf.h \
+               $(STAGING_DIR)/usr/include/zlib.h \
+               $(STAGING_DIR)/usr/lib/libz.a \
+               $(STAGING_DIR)/usr/lib/libz.so*
+endef

 
 

-compile: install-dev
-clean: uninstall-dev
+$(eval $(call BuildPackage,zlib))