From 12120339e27533c84ef0ae388827f4fe7d4d86b6 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 28 Mar 2007 18:01:46 +0000 Subject: [PATCH 1/1] nuke some unnecessary complexity in the metadata scanning - simply call include/scan.mk on every make invocation (does not add any noticeable performance impact) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6745 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 718053e006..bcbfd561b9 100644 --- a/Makefile +++ b/Makefile @@ -44,36 +44,11 @@ ifeq ($(FORCE),) world: tmp/.prereq-packages tmp/.prereq-target endif -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 - -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)" - -endef +tmp/.pkginfo: FORCE + @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(shell ls include/package*.mk) include/kernel.mk" SCAN_EXTRA="" -$(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)) +tmp/.targetinfo: FORCE + @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="$(shell ls include/kernel*.mk)" SCAN_EXTRA="" tmpinfo-clean: FORCE @-rm -rf tmp/.pkginfo tmp/.targetinfo -- 2.11.0