aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-07-29 11:30:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-07-29 11:30:06 +0000
commitd030852b98b1913e024c4a57fbfc75ba9b7cbffe (patch)
tree201dc84d4cf223dae33e04cc23a092b7fb9acf36 /Makefile
parent81d0309b9f38b4883816fa52845cd29e227c0efa (diff)
downloadupstream-d030852b98b1913e024c4a57fbfc75ba9b7cbffe.tar.gz
upstream-d030852b98b1913e024c4a57fbfc75ba9b7cbffe.tar.bz2
upstream-d030852b98b1913e024c4a57fbfc75ba9b7cbffe.zip
add support for per-package prereq checks, run global prereq checks before (menu-)config
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4318 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile25
1 files changed, 18 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e2e467cd8c..a23f478d7c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,14 +31,17 @@ export OPENWRTVERSION
all: world
-.pkginfo: FORCE
ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
+.pkginfo: FORCE
+.config: FORCE
+endif
+
+.pkginfo:
@echo Collecting package info...
@-for dir in package/*/; do \
echo Source-Makefile: $${dir}Makefile; \
$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
done > $@
-endif
.config.in: .pkginfo
@./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
@@ -77,18 +80,25 @@ target/%: .pkginfo FORCE
toolchain/%: FORCE
$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
-.config: ./scripts/config/conf FORCE
+.config: ./scripts/config/conf
@[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
@$< -D .config Config.in &> /dev/null
-.prereq: $(TOPDIR)/include/prereq.mk .pkginfo
- @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq.mk prereq 2>/dev/null || { \
+.prereq-build: $(TOPDIR)/include/prereq-build.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 $@
-prereq: .prereq FORCE
+.prereq-packages: $(TOPDIR)/include/prereq.mk .pkginfo .config
+ @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+ echo "Prerequisite check failed. Use FORCE=1 to override."; \
+ false; \
+ }
+ @touch $@
+
+prereq: .prereq-build .prereq-packages FORCE
download: .config FORCE
$(MAKE) toolchain/download
@@ -96,7 +106,8 @@ download: .config FORCE
$(MAKE) target/download
ifeq ($(FORCE),)
-world: .prereq
+.config ./scripts/config/conf ./scripts/config/mconf: .prereq-build
+world: .prereq-packages
endif
world: .config FORCE