Remove packages when cleaning

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 1a0c385..b0c1f77 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -28,6 +28,14 @@ ifneq ($(BR2_PACKAGE_IP6TABLES),)
 TARGETS += $(PKG_IP6T)
 endif
 
 TARGETS += $(PKG_IP6T)
 endif
 

+INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
+ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
+endif
+ifeq ($(BR2_PACKAGE_IP6TABLES),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list
+endif
+

 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
        $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
        $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)


@@ -58,6 +66,9 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT)
+       $(IPKG) install $(PKG_IPT)
+

 $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
        mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables
 $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
        mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables


@@ -67,6 +78,9 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT)
+       $(IPKG) install $(PKG_IPT_EXTRA)
+

 $(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
 $(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


@@ -79,19 +93,15 @@ $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T)
+       $(IPKG) install $(PKG_IP6T)
+

 
 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
 prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(TARGETS)
 
 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
 prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(TARGETS)

-install: compile
-       $(IPKG) install $(PKG_IPT)
-ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
-       $(IPKG) install $(PKG_IPT_EXTRA)
-endif
-ifeq ($(BR2_PACKAGE_IP6TABLES),y)
-       $(IPKG) install $(PKG_IP6T)
-endif
+install: $(INSTALL_TARGETS)

 
 clean:
        rm -rf $(PKG_BUILD_DIR)
 
 clean:
        rm -rf $(PKG_BUILD_DIR)

-       rm -f $(PKG_IPT) 
+       rm -f $(PKG_IPT) $(PKG_IPT_EXTRA) $(PKG_IP6T)