aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-24 22:23:21 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-11-24 22:23:21 +0100
commitb24c1139fb4fb6e1bf8ca5a753ee95b497717b17 (patch)
tree709625fb571eedc4f7569c64dacd96d4ef1f93e8
parentb1278a38bcb108fad3230ecce94a53b64571f9de (diff)
downloadbusybox-w32-b24c1139fb4fb6e1bf8ca5a753ee95b497717b17.tar.gz
busybox-w32-b24c1139fb4fb6e1bf8ca5a753ee95b497717b17.tar.bz2
busybox-w32-b24c1139fb4fb6e1bf8ca5a753ee95b497717b17.zip
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 f81bcead0..7084c5c1d 100644
--- a/Makefile
+++ b/Makefile
@@ -358,6 +358,13 @@ scripts_basic:
358# To avoid any implicit rule to kick in, define an empty command. 358# To avoid any implicit rule to kick in, define an empty command.
359scripts/basic/%: scripts_basic ; 359scripts/basic/%: scripts_basic ;
360 360
361# bbox: we have helpers in applets/
362PHONY += applets_dir
363applets_dir:
364 $(Q)$(MAKE) $(build)=applets
365
366applets/%: applets_dir ;
367
361PHONY += outputmakefile 368PHONY += outputmakefile
362# outputmakefile generates a Makefile in the output directory, if using a 369# outputmakefile generates a Makefile in the output directory, if using a
363# separate output directory. This allows convenient use of make in the 370# separate output directory. This allows convenient use of make in the
@@ -797,7 +804,7 @@ ifneq ($(KBUILD_MODULES),)
797 $(Q)rm -f $(MODVERDIR)/* 804 $(Q)rm -f $(MODVERDIR)/*
798endif 805endif
799 806
800archprepare: prepare1 scripts_basic 807archprepare: prepare1 scripts_basic applets_dir
801 808
802prepare0: archprepare FORCE 809prepare0: archprepare FORCE
803 $(Q)$(MAKE) $(build)=. 810 $(Q)$(MAKE) $(build)=.
diff --git a/applets/Kbuild b/applets/Kbuild
index a6b0cf6fb..88e98167a 100644
--- a/applets/Kbuild
+++ b/applets/Kbuild
@@ -12,6 +12,9 @@ hostprogs-y += usage usage_pod applet_tables
12 12
13always:= $(hostprogs-y) 13always:= $(hostprogs-y)
14 14
15# fixdep is needed to compile other host programs
16$(addprefix $(obj)/,$(always)): $(objtree)/scripts/basic/fixdep
17
15# Generated files need additional love 18# Generated files need additional love
16 19
17# This trick decreases amount of rebuilds 20# This trick decreases amount of rebuilds