From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 18 Jan 2016 13:21:32 +0000 (+0000)
Subject: iptables: fix rebuild errors on configuration changes
X-Git-Tag: reboot~813
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3c8827fa7f72af0b88db529f2a71fc42b00d8cab;p=openwrt%2Fstaging%2Fnoltari.git

iptables: fix rebuild errors on configuration changes

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48314
---

diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index 626b252761..e5bca40c7e 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -448,6 +448,20 @@ MAKE_FLAGS := \
 	KBUILD_OUTPUT="$(LINUX_DIR)" \
 	BUILTIN_MODULES="$(patsubst ip6t_%,%,$(patsubst ipt_%,%,$(patsubst xt_%,%,$(IPT_BUILTIN) $(IPT_CONNTRACK-m) $(IPT_NAT-m))))"
 
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+  define Build/Configure/rebuild
+	$(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.\?o -or -name \*.a | $(XARGS) rm -f
+	rm -f $(PKG_BUILD_DIR)/.config_*
+	rm -f $(PKG_BUILD_DIR)/.configured_*
+	touch $(subst .configured_,.config_,$(STAMP_CONFIGURED))
+  endef
+endif
+
+define Build/Configure
+$(Build/Configure/rebuild)
+$(Build/Configure/Default)
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/iptables