X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fscan.mk;h=e6bc0688b784863c33b659353e8ef49ef52f614e;hb=62da60b22032b59a52b0671a40c59105bdee8c55;hp=5bb263d713c03487e6e5c45ea50f222ca6b3f985;hpb=426e4d93bb2a36022f505d7dddeb7571dcd0b524;p=openwrt%2Fstaging%2Fyousong.git diff --git a/include/scan.mk b/include/scan.mk index 5bb263d713..e6bc0688b7 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -28,7 +28,7 @@ endef define PackageDir $(TMP_DIR)/.$(SCAN_TARGET): $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1) - $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(2)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(2)/$(DEP)))) + $(TMP_DIR)/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(2)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(2)/$(DEP)))) { \ $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \ echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \ @@ -93,7 +93,7 @@ $(TARGET_STAMP):: } \ ) -$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP) +$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(call progress,Collecting $(SCAN_NAME) info: merging...) -cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 2>/dev/null $(call progress,Collecting $(SCAN_NAME) info: done)