remove trailing spaces to fix errors at dump time

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index af4b390..a9ca3a2 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -30,16 +30,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
        +$(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=""
 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; \
        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


@@ -65,7 +66,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 +95,7 @@ download: .config FORCE
        $(MAKE) -j1 package/download
        $(MAKE) -j1 target/download
 
        $(MAKE) -j1 package/download
        $(MAKE) -j1 target/download
 

-clean dirclean distclean:
+clean dirclean:

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


@@ -118,8 +119,11 @@ symlinkclean:
        -find package -type l | xargs rm -f
        rm -rf tmp
 
        -find package -type l | xargs rm -f
        rm -rf tmp
 

+distclean:
+       rm -rf tmp build_dir staging_dir dl .config*
+

 ifeq ($(findstring v,$(DEBUG)),)
 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 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:
 endif
 .PHONY: help FORCE
 .NOTPARALLEL: