X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fscan.mk;h=aa7c2e74b5e3ba6dd2a647ba7c15f651dd9a4192;hb=7b3d6c14f8746184255e0a7f7e537c90bd9d02ac;hp=a7f74ecec8b637cfa46d8b3aed6d679497717984;hpb=1d87934c5561dcadd4a46d977f4bc19b678ad10e;p=openwrt-10.03%2F.git diff --git a/include/scan.mk b/include/scan.mk index a7f74ecec..aa7c2e74b 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -28,7 +28,6 @@ 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)-* - mkdir -p $(shell dirname $@) touch $@ endif @@ -41,12 +40,12 @@ 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 $(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