diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-04 21:07:29 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-04 21:07:29 +0000 |
| commit | 1d45d04ef7ca05ad12690e8d1e467b540df9f9ac (patch) | |
| tree | df9ce7439acbaee3144497810074ceb02fe9dc6e /Makefile | |
| parent | 4efb08ae2dfdef73743129184e49fdbf392f6720 (diff) | |
fix metadata scan for profile split
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6515 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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 |