oops... forgot to make x86-2.6 ext2 images use preinit as well :)

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 25f2f4e..f6d4fff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ ifeq ($(FORCE),)
 endif
 
 define stamp
 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)
 endef
 
 STAMP_pkginfo=$(call stamp,pkginfo,package)


@@ -57,19 +57,23 @@ $(STAMP_$(1)):
        @rm -f tmp/info/.stamp-$(1)*
        @touch $$@
 
        @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): $(FILE)
 $(FILE):
 )
 

+ifneq ($(5),)
+tmp/.$(1): $(shell ls $(5))
+endif
+

 tmp/.$(1): $(STAMP_$(1)) $(4)
        @echo -n Collecting $(3) info... 
 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))
 
 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
 
 tmpinfo-clean: FORCE
        @-rm -rf tmp/.pkginfo tmp/.targetinfo