svn commit: trunk/busybox

vapier at busybox.net vapier at busybox.net
Sun Sep 25 04:53:37 UTC 2005


Author: vapier
Date: 2005-09-24 21:53:35 -0700 (Sat, 24 Sep 2005)
New Revision: 11641

Log:
this should fix parallel building with .depend/bb_config.h

Modified:
   trunk/busybox/Makefile


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2005-09-25 03:12:26 UTC (rev 11640)
+++ trunk/busybox/Makefile	2005-09-25 04:53:35 UTC (rev 11641)
@@ -110,7 +110,6 @@
 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 @@
 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 @@
 	scripts/config/mkconfigs > $@
 endif
 
+depend dep $(top_builddir)/.depend: .depend
 .depend: scripts/bb_mkdep $(DEP_INCLUDES)
 	@rm -f .depend
 	@mkdir -p include/config




More information about the busybox-cvs mailing list