X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/af927159a9e65228875999840012a1cde1c36b6a..139d1393f9eb551c3a9382b3d364801c4ac6aa65:/include/toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 33b318abb..c92686019 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -16,7 +16,7 @@ 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
@@ -30,15 +30,18 @@ endif
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
-tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo: FORCE
+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=""
+	+$(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; }
+	./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 \
@@ -49,6 +52,8 @@ tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo: FORCE
 scripts/config/mconf:
 	@+$(MAKE) -C scripts/config all
 
+$(eval $(call rdep,scripts/config,scripts/config/mconf))
+
 scripts/config/conf:
 	@+$(MAKE) -C scripts/config conf
 
@@ -63,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 \
@@ -92,7 +97,7 @@ download: .config FORCE
 	$(MAKE) -j1 package/download
 	$(MAKE) -j1 target/download
 
-clean dirclean distclean:
+clean dirclean:
 	@$(MAKE) $@ 
 
 prereq:: .config
@@ -101,7 +106,7 @@ prereq:: .config
 
 %::
 	@+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq
-	@+$(MAKE) $@ 
+	@+$(MAKE) -r $@
 
 help:
 	cat README
@@ -116,8 +121,11 @@ symlinkclean:
 	-find package -type l | xargs rm -f
 	rm -rf tmp
 
+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 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 prepare-tmpinfo
 endif
 .PHONY: help FORCE
 .NOTPARALLEL: