X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2be1609f02efbf4369102933a0220e93ab917d41..8d00b42964662d768a1d86e100eb473f8de4f768:/include/toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 359c7cf71..1826bc11a 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -7,21 +7,22 @@
 #
 
 RELEASE:=Kamikaze
-#VERSION:=2.0 # uncomment for final release
-
 SHELL:=/usr/bin/env bash
-OPENWRTVERSION:=$(RELEASE)
 PREP_MK= OPENWRT_BUILD= QUIET=0
+
 include $(TOPDIR)/include/verbose.mk
-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+
+ifeq ($(SDK),1)
+  include $(TOPDIR)/include/version.mk
 else
-  REV:=$(if $(wildcard .svn/entries),$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ))
-  ifneq ($(REV),)
-    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-  endif
+  REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)
 endif
+
+OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
+export RELEASE
+export REVISION
 export OPENWRTVERSION
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
@@ -34,8 +35,8 @@ 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"
+	+$(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=5 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 $(TOPDIR)/include/target.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; }; \
@@ -52,6 +53,8 @@ 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
 
@@ -95,7 +98,7 @@ download: .config FORCE
 	$(MAKE) -j1 package/download
 	$(MAKE) -j1 target/download
 
-clean dirclean:
+clean dirclean: .config
 	@$(MAKE) $@ 
 
 prereq:: .config
@@ -115,12 +118,8 @@ docs docs/compile: FORCE
 docs/clean: FORCE
 	$(MAKE) -C docs clean
 
-symlinkclean:
-	-find package -type l | xargs rm -f
-	rm -rf tmp
-
 distclean:
-	rm -rf tmp build_dir staging_dir dl .config* feeds
+	rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds bin
 
 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