Uniformize package Makefile

[openwrt-10.03/.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index d09d4378a917e51729b78c4ecf0ad814e4a08a4d..5e05915e210f43ec620bc5c1c9fe8a68360a833d 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -2,66 +2,70 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := zlib
-PKG_VERSION := 1.2.2
-PKG_RELEASE := 1
-PKG_MD5SUM := 68bd51aaa6558c3bc3fd4890e53413de
+PKG_NAME:=zlib
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+PKG_MD5SUM:=68bd51aaa6558c3bc3fd4890e53413de
 
-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:=\
+       http://www.zlib.net/ \
+       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+IPKG_ZLIB:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+IDIR_ZLIB:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
+INFO_ZLIB:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
-$(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) -
+$(DL_DIR)/$(PKG_SOURCE):
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch
-       touch $(PKG_BUILD_DIR)/.patched
+       touch $(PKG_BUILD_DIR)/.prepared
 
-$(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)     
+               $(TARGET_CONFIGURE_OPTS) \
+               ./configure \
+               --prefix=/usr \
+               --shared \
+       );
        touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/libz.so: $(PKG_BUILD_DIR)/.configured
+$(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
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+               libz.a libz.so
+       touch $(PKG_BUILD_DIR)/.built
 
-$(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so
+$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
        $(MAKE) -C $(PKG_BUILD_DIR) \
-         DESTDIR="$(STAGING_DIR)" \
-         install
+               DESTDIR="$(STAGING_DIR)" \
+               install
 
-$(PKG_IPK): $(STAGING_DIR)/lib/libz.so
+$(IPKG_ZLIB): $(STAGING_DIR)/usr/lib/libz.so
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       mkdir -p $(IDIR_ZLIB)/usr/lib
+       cp -a $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
+       $(STRIP) $(IDIR_ZLIB)/usr/lib/lib*.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_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
 
-$(IPKG_STATE_DIR)/info/zlib.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
+$(INFO_ZLIB): $(IPKG_ZLIB)
+       $(IPKG) install $(IPKG_ZLIB)
 
-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
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: $(IPKG_ZLIB)
+install: $(INFO_ZLIB)
 
 clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib*
-       rm -f $(PACKAGE_DIR)/zlib\*.ipk
-
+       -$(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR="$(STAGING_DIR)" \
+               uninstall
+       rm -rf $(PKG_BUILD_DIR) $(IPKG_ZLIB)