aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-09-25 04:53:35 +0000
committerMike Frysinger <vapier@gentoo.org>2005-09-25 04:53:35 +0000
commitde242f6d5f14a3a40749f97e86ab8d982c86b529 (patch)
tree17741ccd5866878ebfd2fbf3cd2e8180c6d4f1c9
parent1ff789c5679d03d2949e3d64e03b8849027fb55e (diff)
downloadbusybox-w32-de242f6d5f14a3a40749f97e86ab8d982c86b529.tar.gz
busybox-w32-de242f6d5f14a3a40749f97e86ab8d982c86b529.tar.bz2
busybox-w32-de242f6d5f14a3a40749f97e86ab8d982c86b529.zip
this should fix parallel building with .depend/bb_config.h
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 965597298..01eec3b84 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,6 @@ $(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
114busybox: $(ALL_MAKEFILES) .depend $(libraries-y) 113busybox: $(ALL_MAKEFILES) .depend $(libraries-y)
115 $(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group 114 $(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group
116 $(STRIPCMD) $@ 115 $(STRIPCMD) $@
@@ -184,9 +183,8 @@ docs/busybox.net/BusyBox.html: docs/busybox.pod
184scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c 183scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
185 $(HOSTCC) $(HOSTCFLAGS) -o $@ $< 184 $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
186 185
187depend dep: .depend 186DEP_INCLUDES := include/config.h include/bb_config.h
188 187
189DEP_INCLUDES=include/config.h include/bb_config.h
190ifeq ($(strip $(CONFIG_BBCONFIG)),y) 188ifeq ($(strip $(CONFIG_BBCONFIG)),y)
191DEP_INCLUDES += include/bbconfigopts.h 189DEP_INCLUDES += include/bbconfigopts.h
192 190
@@ -194,6 +192,7 @@ include/bbconfigopts.h: .config
194 scripts/config/mkconfigs > $@ 192 scripts/config/mkconfigs > $@
195endif 193endif
196 194
195depend dep $(top_builddir)/.depend: .depend
197.depend: scripts/bb_mkdep $(DEP_INCLUDES) 196.depend: scripts/bb_mkdep $(DEP_INCLUDES)
198 @rm -f .depend 197 @rm -f .depend
199 @mkdir -p include/config 198 @mkdir -p include/config