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-de242f6d5f14a3a40749f97e86ab8d982c86b529.tar.gz
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
include $(patsubst %,%/Makefile.in, $(SRC_DIRS))
-include $(top_builddir)/.depend
-%.o: .depend
busybox: $(ALL_MAKEFILES) .depend $(libraries-y)
$(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group
$(STRIPCMD) $@
@@ -184,9 +183,8 @@ docs/busybox.net/BusyBox.html: docs/busybox.pod
scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
-depend dep: .depend
+DEP_INCLUDES := include/config.h include/bb_config.h
-DEP_INCLUDES=include/config.h include/bb_config.h
ifeq ($(strip $(CONFIG_BBCONFIG)),y)
DEP_INCLUDES += include/bbconfigopts.h
@@ -194,6 +192,7 @@ include/bbconfigopts.h: .config
scripts/config/mkconfigs > $@
endif
+depend dep $(top_builddir)/.depend: .depend
.depend: scripts/bb_mkdep $(DEP_INCLUDES)
@rm -f .depend
@mkdir -p include/config