Author: nbd Date: 2015-03-15 12:07:29 +0100 (Sun, 15 Mar 2015) New Revision: 44774
Modified: trunk/include/scan.mk Log: build: use different grep strings for scanning package vs target metadata Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/include/scan.mk =================================================================== --- trunk/include/scan.mk 2015-03-15 11:06:50 UTC (rev 44773) +++ trunk/include/scan.mk 2015-03-15 11:07:29 UTC (rev 44774) @@ -47,9 +47,15 @@ rm -f $(TMP_DIR)/info/.overrides-$(SCAN_TARGET)-* touch $@ +ifeq ($(SCAN_NAME),target) + GREP_STRING=BuildTarget +else + GREP_STRING=(Build/DefaultTargets|BuildPackage|.+Package) +endif + $(FILELIST): $(OVERRIDELIST) rm -f $(TMP_DIR)/info/.files-$(SCAN_TARGET)-* - $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq | awk -v of=$(OVERRIDELIST) -f include/scan.awk > $@ + $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call $(GREP_STRING)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq | awk -v of=$(OVERRIDELIST) -f include/scan.awk > $@ $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST) ( \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
