clean up popt package

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index b0c1f77..2f12dbd 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,9 +1,12 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 include kernelconfig.mk
 
 PKG_NAME := iptables
-PKG_VERSION := 1.2.11
+PKG_VERSION := 1.3.1
 PKG_RELEASE := 1
+PKG_MD5SUM := c3358a3bd0d7755df0b64a5063db296b
 
 PKG_SOURCE_SITE := http://www.netfilter.org/files
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -13,14 +16,19 @@ PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
 
 PKG_IPT := $(PACKAGE_DIR)/iptables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPT_UTILS := $(PACKAGE_DIR)/iptables-utils_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PKG_IPT_EXTRA := $(PACKAGE_DIR)/iptables-extra_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PKG_IP6T := $(PACKAGE_DIR)/ip6tables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 I_IPT := $(PKG_BUILD_DIR)/ipkg/iptables
+I_IPT_UTILS := $(PKG_BUILD_DIR)/ipkg/iptables-utils
 I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra
 I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables
 
-TARGETS := $(PKG_IPT)
+TARGETS := $(STAGING_DIR)/libipq/libipq.a $(PKG_IPT)
+ifneq ($(BR2_PACKAGE_IPTABLES_UTILS),)
+TARGETS += $(PKG_IPT_UTILS)
+endif
 ifneq ($(BR2_PACKAGE_IPTABLES_EXTRA),)
 TARGETS += $(PKG_IPT_EXTRA)
 endif
@@ -29,6 +37,9 @@ TARGETS += $(PKG_IP6T)
 endif
 
 INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
+ifeq ($(BR2_PACKAGE_IPTABLES_UTILS),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-utils.list
+endif
 ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
 INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
 endif
@@ -38,7 +49,7 @@ endif
 
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(PKG_BUILD_DIR)/modules
@@ -51,6 +62,16 @@ $(PKG_BUILD_DIR)/iptables: $(PKG_BUILD_DIR)/.patched
        $(MAKE) -C $(PKG_BUILD_DIR) \
                KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
                CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)"
+               
+$(STAGING_DIR)/libipq/libipq.a: $(PKG_BUILD_DIR)/iptables
+       $(TARGET_CONFIGURE_OPTS) \
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
+               libipq/libipq.a
+       cp -a $(PKG_BUILD_DIR)/include/* $(STAGING_DIR)/include/
+       cp $(PKG_BUILD_DIR)/libipq/libipq.a $(STAGING_DIR)/lib/
+       cp $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/lib/
 
 $(PKG_IPT): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT) control/iptables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
@@ -61,8 +82,6 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables
        (cd $(PKG_BUILD_DIR)/extensions; \
         cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables)
        -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so
-       mkdir -p $(I_IPT_EXTRA)/$(MODULES_SUBDIR)
-       cp $(MODULES_DIR)/kernel/net/ipv6/netfilter/*.o $(I_IPT_EXTRA)/$(MODULES_SUBDIR)
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
 
@@ -81,6 +100,18 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
 $(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT)
        $(IPKG) install $(PKG_IPT_EXTRA)
 
+$(PKG_IPT_UTILS): $(PKG_BUILD_DIR)/iptables
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_UTILS) control/iptables-utils.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
+       mkdir -p $(I_IPT_UTILS)/usr/sbin
+       cp $(PKG_BUILD_DIR)/iptables-save $(I_IPT_UTILS)/usr/sbin
+       cp $(PKG_BUILD_DIR)/iptables-restore $(I_IPT_UTILS)/usr/sbin
+       -$(STRIP) $(I_IPT_UTILS)/usr/sbin/*
+       mkdir -p $(PACKAGE_DIR)
+       $(IPKG_BUILD) $(I_IPT_UTILS) $(PACKAGE_DIR)
+
+$(IPKG_STATE_DIR)/info/iptables-utils.list: $(PKG_IPT)
+       $(IPKG) install $(PKG_IPT_UTILS)
+
 $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
        mkdir -p $(I_IP6T)/usr/sbin