X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=Makefile;h=f6d4fff3aba17a51727064122b5e0681d883dd8a;hp=d9db23678d49989e6acf027372a1ec02bdfdec86;hb=6bbbeb5d67faeb14ad1fdb55d778a8159b653bed;hpb=423e90915d930f680ffec4eb5157696deaac35ba diff --git a/Makefile b/Makefile index d9db23678d..f6d4fff3ab 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): ) -tmp/.$(1): $(STAMP_$(1)) +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