summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-03 15:08:55 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-03 15:08:55 +0000
commitf297cbb2d1e739b1c783c1328536301a7534c3cb (patch)
tree9dc7e4d7f6033a07d46863a13e5cf027407065f9
parent8e52b00c08077ea9d8a8c7dac30be9c98d0ad833 (diff)
optimize the .config dependency chain in the toplevel makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14740 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/toplevel.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk
index 7f5308fc2..9dfc9dfc2 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -49,7 +49,7 @@ prepare-tmpinfo: FORCE
./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
touch $(TOPDIR)/tmp/.build
-.config: ./scripts/config/conf prepare-tmpinfo $(if $(CONFIG_HAVE_DOT_CONFIG),,FORCE)
+.config: ./scripts/config/conf $(if $(CONFIG_HAVE_DOT_CONFIG),,prepare-tmpinfo)
@+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \
[ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
$(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \
@@ -106,7 +106,7 @@ download: .config FORCE
clean dirclean: .config
@+$(SUBMAKE) -r $@
-prereq:: .config
+prereq:: prepare-tmpinfo .config
@+$(MAKE) -r -s tmp/.prereq-build $(PREP_MK)
@+$(NO_TRACE_MAKE) -r -s $@