X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cd23d9d0f296226f8983f580fc3125dd6b91a769..9910132d53a7f2b5ab8f2933c052c1f8d21dedca:/Makefile

diff --git a/Makefile b/Makefile
index b1970b09c..f6d4fff3a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,44 +39,41 @@ else
 endif
 export OPENWRTVERSION
 
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.pkginfo package scripts include),tmp/.pkginfo)
-  tmp/.pkginfo: FORCE
-endif
-
-ifneq ($(shell ./scripts/timestamp.pl -p tmp/.targetinfo target/linux scripts include),tmp/.targetinfo)
-  tmp/.targetinfo: FORCE
-endif
-
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
   world: tmp/.prereq-packages tmp/.prereq-target
 endif
 
-ifeq ($(IS_TTY),1)
-  define progress
-	printf "\033[M\r$(1)" >&2;
-  endef
+define stamp
+tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
+endef
+
+STAMP_pkginfo=$(call stamp,pkginfo,package)
+STAMP_targetinfo=$(call stamp,targetinfo,target/linux)
+define scan_info
+
+$(STAMP_$(1)):
+	@mkdir -p tmp/info
+	@rm -f tmp/info/.stamp-$(1)*
+	@touch $$@
+
+$(foreach FILE,$(shell ls $(2)/*/Makefile $(5)),
+tmp/.$(1): $(FILE)
+$(FILE):
+)
+
+ifneq ($(5),)
+tmp/.$(1): $(shell ls $(5))
 endif
 
-define dumpinfo
-	@mkdir -p tmp
-	@echo -n Collecting $(2) info... 
-	@-for dir in $(1)/*/; do \
-		[ -f "$${dir}/Makefile" ] || continue; \
-		$(call progress,Collecting $(2) info: $${dir%%/}) \
-		echo Source-Makefile: $${dir}Makefile; \
-		$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
-		echo; \
-	done > $@
-	@($(call progress,Collecting $(2) info: done))
-	@echo
-endef
+tmp/.$(1): $(STAMP_$(1)) $(4)
+	@echo -n Collecting $(3) info... 
+	@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$(1)" SCAN_DIR="$(2)" SCAN_NAME="$(3)" SCAN_DEPS="$(4)" SCAN_EXTRA="$(5)"
 
-tmp/.pkginfo:
-	$(call dumpinfo,package,package)
+endef
 
-tmp/.targetinfo:
-	$(call dumpinfo,target/linux,target)
+$(eval $(call scan_info,pkginfo,package,package,include/package.mk))
+$(eval $(call scan_info,targetinfo,target/linux,target,include/kernel-build.mk include/kernel-version.mk,target/linux/*/profiles/*.mk))
 
 tmpinfo-clean: FORCE
 	@-rm -rf tmp/.pkginfo tmp/.targetinfo
@@ -114,13 +111,15 @@ menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
 	$< Config.in
 
 kernel_menuconfig: .config FORCE
-	$(MAKE) target/linux-prepare
+	-$(MAKE) target/linux-prepare
 	$(NO_TRACE_MAKE) -C target/linux menuconfig
 
-package/%: tmp/.pkginfo tmp/.targetinfo FORCE
+package/%: 
+	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
-target/%: tmp/.pkginfo tmp/.targetinfo FORCE
+target/%:
+	@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
 tools/%: FORCE