X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1d87934c5561dcadd4a46d977f4bc19b678ad10e..7704ded64932217a8a1b8896436f9b9bf5fc01d4:/include/scan.mk 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