summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-11-04 11:42:47 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-11-04 11:42:47 +0000
commit5c0b46f713c7496b80b67f638b62de6ced93e5c6 (patch)
treee6652b80cb564ae311f988cbbb98fecdb4d07905
parentaa3d44691c7240ba8b4d8ce03706dd0ffbf0a497 (diff)
fix parallel build issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9495 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile12
-rw-r--r--include/toplevel.mk1
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index b67413b88..e56535eac 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,7 @@
TOPDIR:=${CURDIR}
LC_ALL:=C
LANG:=C
-IS_TTY:=${shell tty -s && echo 1 || echo 0}
-export TOPDIR LC_ALL LANG IS_TTY
+export TOPDIR LC_ALL LANG
world:
@@ -31,10 +30,13 @@ else
include tools/Makefile
include toolchain/Makefile
-$(toolchain/stamp-compile): $(tools/stamp-compile)
+$(toolchain/stamp-install): $(tools/stamp-install)
$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared
-$(package/stamp-compile): $(target/stamp-compile)
-$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
+$(package/stamp-cleanup): $(target/stamp-compile)
+$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
+$(package/stamp-install): $(package/stamp-compile)
+$(package/stamp-rootfs-prepare): $(package/stamp-install)
+$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare)
$(BUILD_DIR)/.prepared: Makefile
@mkdir -p $$(dirname $@)
diff --git a/include/toplevel.mk b/include/toplevel.mk
index ba5cb3375..793022365 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -22,6 +22,7 @@ else
endif
endif
export OPENWRTVERSION
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
ifeq ($(FORCE),)
.config scripts/config/conf scripts/config/mconf: tmp/.prereq-build