X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9805286b40707a31bdfa39c59afe6c8aecd4e986..ebd4cdb1205e93b0aa309d559c84e7370e7fd4a2:/Makefile

diff --git a/Makefile b/Makefile
index 447457e26..d9db23678 100644
--- a/Makefile
+++ b/Makefile
@@ -39,53 +39,46 @@ 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
-endif
-
-define dumpinfo
-	@mkdir -p tmp
-	@echo -n Collecting package info... 
-	@-for dir in $(1)/*/; do \
-		[ -f "$${dir}/Makefile" ] || continue; \
-		$(call progress,Collecting package 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 package info... done)
-	echo
+define stamp
+tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
 endef
 
-tmp/.pkginfo:
-	$(call dumpinfo,package)
+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 $$@
 
-tmp/.targetinfo:
-	$(call dumpinfo,target/linux)
+$(foreach FILE,$(shell ls $(2)/*/Makefile),
+tmp/.$(1): $(FILE)
+$(FILE):
+)
+
+tmp/.$(1): $(STAMP_$(1))
+	@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)"
+
+endef
+
+$(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))
 
 tmpinfo-clean: FORCE
 	@-rm -rf tmp/.pkginfo tmp/.targetinfo
 
 tmp/.config.in: tmp/.pkginfo
-	@./scripts/gen_package_config.pl < $< > $@ || rm -f $@
+	@./scripts/metadata.pl package_config < $< > $@ || rm -f $@
 
 tmp/.config-target.in: tmp/.targetinfo
-	@./scripts/gen_target_config.pl < $< > $@ || rm -f $@
+	@./scripts/metadata.pl target_config < $< > $@ || rm -f $@
 
 .config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
 	@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
@@ -113,10 +106,16 @@ oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
 menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
 	$< Config.in
 
-package/%: tmp/.pkginfo tmp/.targetinfo FORCE
+kernel_menuconfig: .config FORCE
+	-$(MAKE) target/linux-prepare
+	$(NO_TRACE_MAKE) -C target/linux menuconfig
+
+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
@@ -181,6 +180,12 @@ distclean: dirclean config-clean
 help:
 	cat README
 
+doc:
+	$(MAKE) -C docs/ openwrt.pdf
+
+docclean:
+	$(MAKE) -C docs/ clean
+
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;
 .PHONY: FORCE help