X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Fsdk%2Ffiles%2FMakefile;h=ebd30bf32a1cda1a7a2aa85058d01bc5411c4d4f;hb=d3dea9d2c6f4a981a077f756c41ed5f2da56887f;hp=184a1f9e42fe68a64eec841b1d5f079334bff047;hpb=4113d5a46d9f3cef21eb5cd155e7b974addb93fc;p=openwrt%2Fstaging%2Fmkresin.git diff --git a/target/sdk/files/Makefile b/target/sdk/files/Makefile index 184a1f9e42..ebd30bf32a 100644 --- a/target/sdk/files/Makefile +++ b/target/sdk/files/Makefile @@ -42,16 +42,16 @@ define stamp tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile $(5) | (md5sum || md5) 2>/dev/null | cut -d' ' -f1) endef -STAMP=$(call stamp,pkginfo,package) +STAMP=$(call stamp,packageinfo,package) $(STAMP): @mkdir -p tmp/info - @rm -f tmp/info/.stamp-pkginfo* + @rm -f tmp/info/.stamp-packageinfo* @touch $@ define filedep $(foreach FILE,$(shell ls package/*/Makefile), -tmp/.pkginfo: $(FILE) +tmp/.packageinfo: $(FILE) $(FILE): @true ) @@ -59,12 +59,12 @@ endef $(eval $(filedep)) -tmp/.pkginfo: $(STAMP) +tmp/.packageinfo: $(STAMP) @echo -n Collecting package info... - @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="" + @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="" package/%: FORCE - @$(NO_TRACE_MAKE) -s tmp/.pkginfo + @$(NO_TRACE_MAKE) -s tmp/.packageinfo $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1 download: FORCE @@ -76,7 +76,7 @@ world: FORCE cd package; \ find . -maxdepth 2 -name Config.in | \ sed -e 's,/Config.in,,g' | \ - xargs -r -n1 make compile -C; \ + xargs -n1 $(MAKE) compile -C; \ ) clean: FORCE