summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-24 21:23:21 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-11-24 21:23:21 (GMT)
commitb24c1139fb4fb6e1bf8ca5a753ee95b497717b17 (patch)
tree709625fb571eedc4f7569c64dacd96d4ef1f93e8
parentb1278a38bcb108fad3230ecce94a53b64571f9de (diff)
downloadbusybox-b24c1139fb4fb6e1bf8ca5a753ee95b497717b17.tar.gz
busybox-b24c1139fb4fb6e1bf8ca5a753ee95b497717b17.tar.bz2
build system: fix parallel make
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--Makefile9
-rw-r--r--applets/Kbuild3
2 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f81bcea..7084c5c 100644
--- a/Makefile
+++ b/Makefile
@@ -358,6 +358,13 @@ scripts_basic:
# To avoid any implicit rule to kick in, define an empty command.
scripts/basic/%: scripts_basic ;
+# bbox: we have helpers in applets/
+PHONY += applets_dir
+applets_dir:
+ $(Q)$(MAKE) $(build)=applets
+
+applets/%: applets_dir ;
+
PHONY += outputmakefile
# outputmakefile generates a Makefile in the output directory, if using a
# separate output directory. This allows convenient use of make in the
@@ -797,7 +804,7 @@ ifneq ($(KBUILD_MODULES),)
$(Q)rm -f $(MODVERDIR)/*
endif
-archprepare: prepare1 scripts_basic
+archprepare: prepare1 scripts_basic applets_dir
prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.
diff --git a/applets/Kbuild b/applets/Kbuild
index a6b0cf6..88e9816 100644
--- a/applets/Kbuild
+++ b/applets/Kbuild
@@ -12,6 +12,9 @@ hostprogs-y += usage usage_pod applet_tables
always:= $(hostprogs-y)
+# fixdep is needed to compile other host programs
+$(addprefix $(obj)/,$(always)): $(objtree)/scripts/basic/fixdep
+
# Generated files need additional love
# This trick decreases amount of rebuilds