X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/389529fe3599b90544f09cdae2d6318eefbe2352..4fcbf77ad6679f83bd5663e372962673759541db:/include/toplevel.mk?ds=sidebyside

diff --git a/include/toplevel.mk b/include/toplevel.mk
index d9c16a5ec..c92686019 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -9,14 +9,14 @@
 RELEASE:=Kamikaze
 #VERSION:=2.0 # uncomment for final release
 
-all: world
-
 SHELL:=/usr/bin/env bash
 OPENWRTVERSION:=$(RELEASE)
+PREP_MK= OPENWRT_BUILD= QUIET=0
+include $(TOPDIR)/include/verbose.mk
 ifneq ($(VERSION),)
   OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
 else
-  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
+  REV:=$(if $(wildcard .svn/entries),$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ))
   ifneq ($(REV),)
     OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
   endif
@@ -25,33 +25,37 @@ export OPENWRTVERSION
 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-  world: prereq
 endif
 
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
-tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo:
-	@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=""
-	@for type in package target; do \
+prepare-mk: 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="" SCAN_MAKEOPTS="TARGET_BUILD=1"
+	for type in package target; do \
 		f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
-		[ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config < "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
+		[ "$$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; }
+	touch $(TOPDIR)/tmp/.build
 
 .config: ./scripts/config/conf prepare-tmpinfo
-	if [ \! -f .config ]; then \
+	@+if [ \! -f .config ]; then \
 		[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
-		$(NO_TRACE_MAKE) menuconfig; \
+		$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
 	fi
-	$< -D .config Config.in &> /dev/null
 
 scripts/config/mconf:
-	$(MAKE) -C scripts/config all
+	@+$(MAKE) -C scripts/config all
+
+$(eval $(call rdep,scripts/config,scripts/config/mconf))
 
 scripts/config/conf:
-	$(MAKE) -C scripts/config conf
+	@+$(MAKE) -C scripts/config conf
 
 config: scripts/config/conf prepare-tmpinfo FORCE
 	$< Config.in
@@ -64,7 +68,7 @@ defconfig: scripts/config/conf prepare-tmpinfo FORCE
 	$< -D .config Config.in
 
 oldconfig: scripts/config/conf prepare-tmpinfo FORCE
-	$< -o Config.in
+	$< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in
 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
 	if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
@@ -81,37 +85,28 @@ kernel_menuconfig: .config FORCE
 tmp/.prereq-build: include/prereq-build.mk
 	mkdir -p tmp
 	rm -f tmp/.host.mk
-	$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
+	@+$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
 		echo "Prerequisite check failed. Use FORCE=1 to override."; \
 		false; \
 	}
 	touch $@
 
-tmp/.prereq-package: tmp/.packageinfo
-tmp/.prereq-target: tmp/.targetinfo .config
-tmp/.prereq-package tmp/.prereq-target: include/prereq.mk 
-	mkdir -p tmp
-	rm -f tmp/.host.mk
-	$(NO_TRACE_MAKE) -s -C $(patsubst tmp/.prereq-%,%,$@) prereq 2>/dev/null || { \
-		echo "Prerequisite check failed. Use FORCE=1 to override."; \
-		false; \
-	}
-	touch $@
-
-prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target .config FORCE ;
-
 download: .config FORCE
 	$(MAKE) -j1 tools/download
 	$(MAKE) -j1 toolchain/download
 	$(MAKE) -j1 package/download
 	$(MAKE) -j1 target/download
 
-clean dirclean distclean:
+clean dirclean:
 	@$(MAKE) $@ 
 
+prereq:: .config
+	@+$(SUBMAKE) -s tmp/.prereq-build $(PREP_MK)
+	@$(NO_TRACE_MAKE) -s $@
+
 %::
-	@$(SUBMAKE) -s prereq QUIET=0 OPENWRT_BUILD=
-	@$(MAKE) $@ 
+	@+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq
+	@+$(MAKE) -r $@
 
 help:
 	cat README
@@ -126,7 +121,12 @@ symlinkclean:
 	-find package -type l | xargs rm -f
 	rm -rf tmp
 
-.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
+distclean:
+	rm -rf tmp build_dir staging_dir dl .config* feeds
+
+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 prepare-tmpinfo
+endif
 .PHONY: help FORCE
 .NOTPARALLEL: