reorder nas command line parameters (required for bridge operation)

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index fc57f9c..f8f5909 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,28 +1,29 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.3.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
        ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
        ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_MENU:=IPv4 / IPv6 firewall administration
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
-include $(LINUX_DIR)/.config
-include $(TOPDIR)/target/linux/netfilter.mk
+-include $(LINUX_DIR)/.config
+include $(INCLUDE_DIR)/netfilter.mk
 endif
 
 define Package/iptables
@@ -34,6 +35,11 @@ TITLE:=IPv4 firewall administration tool
 URL:=http://netfilter.org/
 endef
 
+define Package/iptables/conffiles
+/etc/config/firewall
+/etc/firewall.user
+endef
+
 define Package/iptables-mod-conntrack
 SECTION:=net
 CATEGORY:=Base system
@@ -44,7 +50,6 @@ Includes: \\\
        * libipt_conntrack \\\
        * libipt_helper \\\
        * libipt_connmark/CONNMARK
-
 endef
 
 define Package/iptables-mod-filter
@@ -56,7 +61,6 @@ DESCRIPTION:=iptables extensions for packet content inspection\\\
 Includes: \\\
        * libipt_ipp2p \\\
        * libipt_layer7 
-                                               
 endef
 
 define Package/iptables-mod-imq
@@ -67,7 +71,6 @@ TITLE:=IMQ support
 DESCRIPTION:=iptables extension for IMQ support\\\
 Includes: \\\
        * libipt_IMQ
-                                               
 endef
 
 define Package/iptables-mod-ipopt
@@ -85,7 +88,6 @@ Includes: \\\
        * libipt_tcpmms \\\
        * libipt_ttl/TTL \\\
        * libipt_unclean 
-
 endef
 
 define Package/iptables-mod-ipsec
@@ -97,7 +99,6 @@ DESCRIPTION:=iptables extensions for matching ipsec traffic\\\
 Includes: \\\
        * libipt_ah \\\
        * libipt_esp
-
 endef
 
 define Package/iptables-mod-nat
@@ -132,7 +133,6 @@ Includes: \\\
        * libipt_physdev \\\
        * libipt_pkttype \\\
        * libipt_recent
-
 endef
 
 define Package/iptables-utils
@@ -162,6 +162,22 @@ define Build/Compile
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install install-devel
 endef
+
+
+define Build/InstallDev
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
+               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+               DESTDIR="$(STAGING_DIR)" \
+               install install-devel
+endef
+
+define Build/UninstallDev
+       rm -rf $(STAGING_DIR)/usr/include/libipq.h
+       rm -rf $(STAGING_DIR)/usr/lib/libipq.a
+endef
+
                
 define Package/iptables/install
        install -d -m0755 $(1)/etc/config
@@ -223,21 +239,3 @@ $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
 $(eval $(call BuildPlugin,iptables-mod-nat,$(IPT_NAT-m)))
 $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
 $(eval $(call BuildPackage,ip6tables))
-
-
-$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
-               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
-               DESTDIR="$(STAGING_DIR)" \
-               install install-devel
-
-install-dev: $(STAGING_DIR)/usr/lib/libipq.a
-uninstall-dev:
-       rm -rf $(STAGING_DIR)/usr/include/libipq.h
-       rm -rf $(STAGING_DIR)/usr/lib/libipq.a
-
-compile-targets: install-dev
-clean-targets: uninstall-dev
-