add netfilter connmark target

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index b01ff46..95f6ce9 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -1,64 +1,61 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := zlib
-PKG_VERSION := 1.2.2
-PKG_RELEASE := 1
+PKG_NAME:=zlib
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5
 
-PKG_SOURCE_SITE := http://www.zlib.net/
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-PKG_IPK := $(PACKAGE_DIR)/zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_SOURCE_URL:=@SF/zlib
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE)
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
-       mkdir -p $(TOOL_BUILD_DIR)
-       $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch
-       touch $(PKG_BUILD_DIR)/.patched
+$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        (cd $(PKG_BUILD_DIR); \
-       $(TARGET_CONFIGURE_OPTS) \
-       ./configure \
-         --prefix=/ \
-         --shared)     
-       touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/libz.so: $(PKG_BUILD_DIR)/.configured
+               $(TARGET_CONFIGURE_OPTS) \
+               ./configure \
+               --prefix=/usr \
+               --shared \
+       );
+       touch $@
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR) \
-         $(TARGET_CONFIGURE_OPTS) \
-         CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
-        libz.a libz.so
-
-$(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+               libz.a libz.so
+       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
-         DESTDIR="$(STAGING_DIR)" \
-         install
-
-$(PKG_IPK): $(STAGING_DIR)/lib/libz.so
-       mkdir -p $(PACKAGE_DIR)
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/zlib zlib.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib
-       cp -a $(PKG_BUILD_DIR)/libz.so* $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib
-       $(STRIP) $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib/*
-       $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/zlib $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/zlib.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(STAGING_DIR)/lib/libz.so $(PKG_IPK)
-install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/zlib.list
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib*
-       rm -f $(PACKAGE_DIR)/zlib\*.ipk
-
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               install
+       touch $@
+
+$(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)
+
+$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(STAGING_DIR)/usr/include
+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h $(STAGING_DIR)/usr/include
+       mkdir -p $(STAGING_DIR)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} $(STAGING_DIR)/usr/lib
+       touch $(STAGING_DIR)/usr/lib/libz.so
+       
+install-dev: $(STAGING_DIR)/usr/lib/libz.so
+
+uninstall-dev:
+       rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h
+       rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*}
+
+compile: install-dev
+clean: uninstall-dev