aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-09-24 06:15:23 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-09-24 06:15:23 +0000
commitc5eab84d364dd34f39d34f7b747a2e4da52f51b9 (patch)
treec3505309b2d962526444dfae81d181b10d5b8154
parent9ce4aaa2090f7454fe76c226c3037100b6347f72 (diff)
downloadbusybox-w32-c5eab84d364dd34f39d34f7b747a2e4da52f51b9.tar.gz
busybox-w32-c5eab84d364dd34f39d34f7b747a2e4da52f51b9.tar.bz2
busybox-w32-c5eab84d364dd34f39d34f7b747a2e4da52f51b9.zip
fix parallel building again
git-svn-id: svn://busybox.net/trunk/busybox@11621 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index de434cb11..965597298 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile
110include $(patsubst %,%/Makefile.in, $(SRC_DIRS)) 110include $(patsubst %,%/Makefile.in, $(SRC_DIRS))
111-include $(top_builddir)/.depend 111-include $(top_builddir)/.depend
112 112
113%.o: .depend
113busybox: $(ALL_MAKEFILES) .depend $(libraries-y) 114busybox: $(ALL_MAKEFILES) .depend $(libraries-y)
114 $(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group 115 $(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group
115 $(STRIPCMD) $@ 116 $(STRIPCMD) $@
@@ -196,7 +197,8 @@ endif
196.depend: scripts/bb_mkdep $(DEP_INCLUDES) 197.depend: scripts/bb_mkdep $(DEP_INCLUDES)
197 @rm -f .depend 198 @rm -f .depend
198 @mkdir -p include/config 199 @mkdir -p include/config
199 scripts/bb_mkdep -c include/config.h -c include/bb_config.h > $@ 200 scripts/bb_mkdep -c include/config.h -c include/bb_config.h > $@.tmp
201 mv $@.tmp $@
200 202
201include/config.h: .config 203include/config.h: .config
202 @if [ ! -x $(top_builddir)/scripts/config/conf ] ; then \ 204 @if [ ! -x $(top_builddir)/scripts/config/conf ] ; then \