Resync x86_64 kernel config and make uml build ext2 images by default

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index cab2486..dbb4a0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,6 @@ SHELL:=/usr/bin/env bash
 export LC_ALL=C
 export LANG=C
 export TOPDIR=${CURDIR}
-ifeq ($(KBUILD_VERBOSE),99)
-  MAKE:=3>/dev/null $(MAKE)
-endif
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
 include $(TOPDIR)/include/verbose.mk
@@ -47,32 +44,32 @@ endif
 package/%/Makefile: ;
 target/%/Makefile: ;
 
-tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) 
-tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)
-tmp/.%info:
-       @mkdir -p tmp/info
-       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA=""
-
-tmpinfo-clean: FORCE
-       @-rm -rf tmp/.*info
+SCAN_COOKIE?=$(shell echo $$$$)
+export SCAN_COOKIE
 
-tmp/.config-%.in: tmp/.%info
-       @./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
+tmp/.packageinfo tmp/.targetinfo: FORCE
+       mkdir -p tmp/info
+       $(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=4 SCAN_EXTRA=""
 
+tmpinfo-clean: FORCE
+       -rm -rf tmp/.*info
 
+tmp/.config-%.in: tmp/.%info scripts/metadata.pl
+       ./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
 
 .config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
-       @if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \ 
-               cp $(HOME)/.openwrt/defconfig .config; \
+       if [ \! -f .config ]; then \
+               [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                $(NO_TRACE_MAKE) menuconfig; \
        fi
-       @$< -D .config Config.in &> /dev/null
+       $< -D .config Config.in &> /dev/null
 
 scripts/config/mconf:
-       @$(MAKE) -C scripts/config all
+       $(MAKE) -C scripts/config all
 
 scripts/config/conf:
-       @$(MAKE) -C scripts/config conf
+       $(MAKE) -C scripts/config conf
 
 
 
@@ -90,16 +87,17 @@ oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORC
        $< -o Config.in
 
 menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE
-       @if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+       if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in
 
+kernel_oldconfig: .config FORCE
+       $(NO_TRACE_MAKE) -C target/linux oldconfig
+
 kernel_menuconfig: .config FORCE
-       -$(MAKE) target/linux-prepare
        $(NO_TRACE_MAKE) -C target/linux menuconfig
 
-
 package/% target/%: tmp/.packageinfo
 toolchain/% package/% target/%: tmp/.targetinfo
 package/% target/% tools/% toolchain/%: FORCE
@@ -107,22 +105,22 @@ package/% target/% tools/% toolchain/%: 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 || { \
+       mkdir -p tmp
+       rm -f tmp/.host.mk
+       $(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 $@
+       touch $@
 
 tmp/.prereq-%: include/prereq.mk tmp/.%info .config
-       @mkdir -p tmp
-       @rm -f tmp/.host.mk
-       @$(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \
+       mkdir -p tmp
+       rm -f tmp/.host.mk
+       $(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
-       @touch $@
+       touch $@
 
 prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
 
@@ -147,21 +145,22 @@ clean: FORCE
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 
-distclean: dirclean config-clean symlinkclean docclean
+distclean: dirclean config-clean symlinkclean docs/clean
        rm -rf dl
 
 help:
        cat README
 
-doc:
-       $(MAKE) -C docs/ openwrt.pdf
+docs docs/compile: FORCE
+       $(MAKE) -C docs compile
 
-docclean:
-       $(MAKE) -C docs/ clean
+docs/clean: FORCE
+       $(MAKE) -C docs clean
 
 symlinkclean:
-       find package -type l -exec rm -f {} +
+       -find package -type l | xargs rm -f
+       rm -rf tmp
 
-.SILENT: clean dirclean distclean symlinkclean config-clean download world help
+.SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.packageinfo tmp/.targetinfo tmpinfo-clean tmp/.config-package.in tmp/.config-target.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target
 FORCE: ;
 .PHONY: FORCE help