diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-28 13:29:03 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-28 13:29:03 +0000 |
| commit | 23660965c9671a573d958374ce1ef0b7c5b317b8 (patch) | |
| tree | c8a6a0f65801669d0749e819d2c5cc4ae410076e /include | |
| parent | 389529fe3599b90544f09cdae2d6318eefbe2352 (diff) | |
build system fixes, more cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8207 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/toplevel.mk | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk index d9c16a5ec..05839832d 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -13,6 +13,7 @@ all: world SHELL:=/usr/bin/env bash OPENWRTVERSION:=$(RELEASE) +include $(TOPDIR)/include/verbose.mk ifneq ($(VERSION),) OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION)) else @@ -33,25 +34,25 @@ export SCAN_COOKIE tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo: @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=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="" @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; }; \ done .config: ./scripts/config/conf prepare-tmpinfo - if [ \! -f .config ]; then \ + @+if [ \! -f .config ]; then \ [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \ - $(NO_TRACE_MAKE) menuconfig; \ + $(NO_TRACE_MAKE) menuconfig QUIET=0 OPENWRT_BUILD=; \ fi $< -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 config: scripts/config/conf prepare-tmpinfo FORCE $< Config.in @@ -81,24 +82,25 @@ kernel_menuconfig: .config 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 || { \ + @+$(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 $@ -tmp/.prereq-package: tmp/.packageinfo +tmp/.prereq-package: tmp/.packageinfo .config tmp/.prereq-target: tmp/.targetinfo .config tmp/.prereq-package tmp/.prereq-target: include/prereq.mk mkdir -p tmp rm -f tmp/.host.mk - $(NO_TRACE_MAKE) -s -C $(patsubst tmp/.prereq-%,%,$@) prereq 2>/dev/null || { \ + @+$(NO_TRACE_MAKE) -s -C $(patsubst tmp/.prereq-%,%,$@) prereq 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ } touch $@ -prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target .config FORCE ; +prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target .config FORCE + @true download: .config FORCE $(MAKE) -j1 tools/download @@ -111,7 +113,7 @@ clean dirclean distclean: %:: @$(SUBMAKE) -s prereq QUIET=0 OPENWRT_BUILD= - @$(MAKE) $@ + @+$(MAKE) $@ help: cat README |