diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-03-28 18:01:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-28 18:01:46 +0000 |
| commit | 49ed9d2da5b4b80b3481a453bacb8b2097788053 (patch) | |
| tree | 89ae78571f230d4959d09dc22299edc47419a2ce | |
| parent | 60bf0ca2ce391d816b5ead69b82092f8bd7efb18 (diff) | |
| download | upstream-49ed9d2da5b4b80b3481a453bacb8b2097788053.tar.gz upstream-49ed9d2da5b4b80b3481a453bacb8b2097788053.tar.bz2 upstream-49ed9d2da5b4b80b3481a453bacb8b2097788053.zip | |
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
| -rw-r--r-- | Makefile | 33 |
1 files changed, 4 insertions, 29 deletions
@@ -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 |