next round of cleanup, convert target/ - make -j works now ;)

[openwrt/svn-archive/archive.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 33b318abb7dd0b13de2b38b561ca8212e89d9c82..af4b390e4eb04909ee75fc38a24eb55b410fe658 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -30,7 +30,7 @@ endif
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
-tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo: FORCE
+prepare-tmpinfo: FORCE
        mkdir -p tmp/info
        +$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_DEPTH=4 SCAN_EXTRA=""
        +$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk" SCAN_DEPTH=2 SCAN_EXTRA=""
@@ -39,6 +39,8 @@ tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo: FORCE
                [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config < "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
        done
        ./scripts/metadata.pl package_mk < tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
+       ./scripts/metadata.pl target_mk < $(TMP_DIR)/.targetinfo > tmp/.target.mk
+       touch $(TOPDIR)/tmp/.build
 
 .config: ./scripts/config/conf prepare-tmpinfo
        @+if [ \! -f .config ]; then \
@@ -101,7 +103,7 @@ prereq:: .config
 
 %::
        @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq
-       @+$(MAKE) $@ 
+       @+$(MAKE) -r $@
 
 help:
        cat README
@@ -117,7 +119,7 @@ symlinkclean:
        rm -rf tmp
 
 ifeq ($(findstring v,$(DEBUG)),)
-  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo
+  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target prepare-tmpinfo
 endif
 .PHONY: help FORCE
 .NOTPARALLEL: