From 1d45d04ef7ca05ad12690e8d1e467b540df9f9ac Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 4 Mar 2007 21:07:29 +0000 Subject: fix metadata scan for profile split git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6515 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 25f2f4eb2..f6d4fff3a 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ ifeq ($(FORCE),) endif define stamp -tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile | (md5sum || md5) 2>/dev/null | cut -d' ' -f1) +tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1) endef STAMP_pkginfo=$(call stamp,pkginfo,package) @@ -57,19 +57,23 @@ $(STAMP_$(1)): @rm -f tmp/info/.stamp-$(1)* @touch $$@ -$(foreach FILE,$(shell ls $(2)/*/Makefile), +$(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)" + @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$(1)" SCAN_DIR="$(2)" SCAN_NAME="$(3)" SCAN_DEPS="$(4)" SCAN_EXTRA="$(5)" 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)) +$(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 -- cgit v1.2.3