make ifxmips use a net bridge

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 8faf8e1..4e194bf 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -7,21 +7,22 @@
 #
 
 RELEASE:=Kamikaze
 #
 
 RELEASE:=Kamikaze

-#VERSION:=2.0 # uncomment for final release
-

 SHELL:=/usr/bin/env bash
 SHELL:=/usr/bin/env bash

-OPENWRTVERSION:=$(RELEASE)

 PREP_MK= OPENWRT_BUILD= QUIET=0
 PREP_MK= OPENWRT_BUILD= QUIET=0

+

 include $(TOPDIR)/include/verbose.mk
 include $(TOPDIR)/include/verbose.mk

-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+
+ifeq ($(SDK),1)
+  include $(TOPDIR)/include/version.mk

 else
 else

-  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-  ifneq ($(REV),)
-    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-  endif
+  REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)

 endif
 endif

+
+OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
+export RELEASE
+export REVISION

 export OPENWRTVERSION
 export OPENWRTVERSION

+export IS_TTY=$(shell tty -s && echo 1 || echo 0)

 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build


@@ -30,16 +31,17 @@ endif
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 

+prepare-mk: FORCE ;
+

 prepare-tmpinfo: FORCE
        mkdir -p tmp/info
 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="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" 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; \
        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
        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
+       ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }

        touch $(TOPDIR)/tmp/.build
 
 .config: ./scripts/config/conf prepare-tmpinfo
        touch $(TOPDIR)/tmp/.build
 
 .config: ./scripts/config/conf prepare-tmpinfo


@@ -51,6 +53,8 @@ prepare-tmpinfo: FORCE
 scripts/config/mconf:
        @+$(MAKE) -C scripts/config all
 
 scripts/config/mconf:
        @+$(MAKE) -C scripts/config all
 

+$(eval $(call rdep,scripts/config,scripts/config/mconf))
+

 scripts/config/conf:
        @+$(MAKE) -C scripts/config conf
 
 scripts/config/conf:
        @+$(MAKE) -C scripts/config conf
 


@@ -65,7 +69,7 @@ defconfig: scripts/config/conf prepare-tmpinfo FORCE
        $< -D .config Config.in
 
 oldconfig: 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 \
 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
        if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \


@@ -94,7 +98,7 @@ download: .config FORCE
        $(MAKE) -j1 package/download
        $(MAKE) -j1 target/download
 
        $(MAKE) -j1 package/download
        $(MAKE) -j1 target/download
 

-clean dirclean:
+clean dirclean: .config

        @$(MAKE) $@ 
 
 prereq:: .config
        @$(MAKE) $@ 
 
 prereq:: .config


@@ -119,7 +123,7 @@ symlinkclean:
        rm -rf tmp
 
 distclean:
        rm -rf tmp
 
 distclean:

-       rm -rf tmp build_dir staging_dir dl .config*
+       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
 
 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