Fix i2c kernel configuration dependency (#1511)

[openwrt-10.03/.git] / include / scan.mk

diff --git a/include/scan.mk b/include/scan.mk
index 7725fc713a8145a4440fc7f7f6874f433c905527..aa7c2e74b5e3ba6dd2a647ba7c15f651dd9a4192 100644 (file)
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -24,16 +24,28 @@ tmp/.$(SCAN_TARGET):
        @($(call progress,Collecting $(SCAN_NAME) info: done))
        @echo
 
+ifneq ($(SCAN_EXTRA),)
+SCAN_STAMP=tmp/info/.scan-$(SCAN_TARGET)-$(shell ls $(SCAN_EXTRA) 2>/dev/null | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
+$(SCAN_STAMP):
+       rm -f tmp/info/.scan-$(SCAN_TARGET)-*
+       touch $@
+endif
+
+# FIXME: generate this dynamically?
+ifeq ($(SCAN_TARGET),pkginfo)
+tmp/info/.pkginfo-kernel: $(shell ls package/kernel/modules/*.mk)
+endif
+
 define scanfiles
 $(foreach FILE,$(SCAN),
   tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) FORCE
-  tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DEPS) $(SCAN_DIR)/$(FILE)/Makefile
-       { \
+  tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DEPS) $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP)
+       grep -E 'include (\$$$$\(INCLUDE_DIR\)|\$$$$\(TOPDIR\)/include)/' $(SCAN_DIR)/$(FILE)/Makefile >/dev/null && { \
                $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(FILE)) \
                echo Source-Makefile: $(SCAN_DIR)/$(FILE)/Makefile; \
                $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $(SCAN_DIR)/$(FILE) 3>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(FILE)/Makefile" >&2; \
                echo; \
-       } > $$@
+       } > $$@ || true
 )
 
 endef