aboutsummaryrefslogtreecommitdiffstats
path: root/include/toplevel.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-07-30 18:22:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-07-30 18:22:01 +0000
commit49e628f7652e9f7ce63b932f83b22756a65ff3b9 (patch)
treeda6a7f4c8cc7c3e49b2af71d736762b4bb431fba /include/toplevel.mk
parent2e072cfb4b9d1818d1bdc98dba70d0d4ff1b56c3 (diff)
downloadupstream-49e628f7652e9f7ce63b932f83b22756a65ff3b9.tar.gz
upstream-49e628f7652e9f7ce63b932f83b22756a65ff3b9.tar.bz2
upstream-49e628f7652e9f7ce63b932f83b22756a65ff3b9.zip
next round of build system cleanup - convert package/ to new structure
SVN-Revision: 8236
Diffstat (limited to 'include/toplevel.mk')
-rw-r--r--include/toplevel.mk42
1 files changed, 16 insertions, 26 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk
index 05839832d2..33b318abb7 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -9,10 +9,9 @@
RELEASE:=Kamikaze
#VERSION:=2.0 # uncomment for final release
-all: world
-
SHELL:=/usr/bin/env bash
OPENWRTVERSION:=$(RELEASE)
+PREP_MK= OPENWRT_BUILD= QUIET=0
include $(TOPDIR)/include/verbose.mk
ifneq ($(VERSION),)
OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
@@ -26,27 +25,26 @@ export OPENWRTVERSION
ifeq ($(FORCE),)
.config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
- world: prereq
endif
SCAN_COOKIE?=$(shell echo $$$$)
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=""
- @for type in package target; do \
+tmp/.packageinfo tmp/.targetinfo 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=""
+ 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
+ ./scripts/metadata.pl package_mk < tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
.config: ./scripts/config/conf prepare-tmpinfo
@+if [ \! -f .config ]; then \
[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
- $(NO_TRACE_MAKE) menuconfig QUIET=0 OPENWRT_BUILD=; \
+ $(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
fi
- $< -D .config Config.in &> /dev/null
scripts/config/mconf:
@+$(MAKE) -C scripts/config all
@@ -88,20 +86,6 @@ tmp/.prereq-build: include/prereq-build.mk
}
touch $@
-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 || { \
- echo "Prerequisite check failed. Use FORCE=1 to override."; \
- false; \
- }
- touch $@
-
-prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target .config FORCE
- @true
-
download: .config FORCE
$(MAKE) -j1 tools/download
$(MAKE) -j1 toolchain/download
@@ -111,8 +95,12 @@ download: .config FORCE
clean dirclean distclean:
@$(MAKE) $@
+prereq:: .config
+ @+$(SUBMAKE) -s tmp/.prereq-build $(PREP_MK)
+ @$(NO_TRACE_MAKE) -s $@
+
%::
- @$(SUBMAKE) -s prereq QUIET=0 OPENWRT_BUILD=
+ @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq
@+$(MAKE) $@
help:
@@ -128,7 +116,9 @@ symlinkclean:
-find package -type l | xargs rm -f
rm -rf tmp
-.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
+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 tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo
+endif
.PHONY: help FORCE
.NOTPARALLEL: