this should fix parallel building with .depend/bb_config.h
This commit is contained in:
parent
1ff789c567
commit
de242f6d5f
5
Makefile
5
Makefile
@ -110,7 +110,6 @@ $(ALL_MAKEFILES): %/Makefile: $(top_srcdir)/%/Makefile
|
|||||||
include $(patsubst %,%/Makefile.in, $(SRC_DIRS))
|
include $(patsubst %,%/Makefile.in, $(SRC_DIRS))
|
||||||
-include $(top_builddir)/.depend
|
-include $(top_builddir)/.depend
|
||||||
|
|
||||||
%.o: .depend
|
|
||||||
busybox: $(ALL_MAKEFILES) .depend $(libraries-y)
|
busybox: $(ALL_MAKEFILES) .depend $(libraries-y)
|
||||||
$(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group
|
$(CC) $(LDFLAGS) -o $@ -Wl,--start-group $(libraries-y) $(LIBRARIES) -Wl,--end-group
|
||||||
$(STRIPCMD) $@
|
$(STRIPCMD) $@
|
||||||
@ -184,9 +183,8 @@ docs/busybox.net/BusyBox.html: docs/busybox.pod
|
|||||||
scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
|
scripts/bb_mkdep: $(top_srcdir)/scripts/bb_mkdep.c
|
||||||
$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
|
$(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)
|
ifeq ($(strip $(CONFIG_BBCONFIG)),y)
|
||||||
DEP_INCLUDES += include/bbconfigopts.h
|
DEP_INCLUDES += include/bbconfigopts.h
|
||||||
|
|
||||||
@ -194,6 +192,7 @@ include/bbconfigopts.h: .config
|
|||||||
scripts/config/mkconfigs > $@
|
scripts/config/mkconfigs > $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
depend dep $(top_builddir)/.depend: .depend
|
||||||
.depend: scripts/bb_mkdep $(DEP_INCLUDES)
|
.depend: scripts/bb_mkdep $(DEP_INCLUDES)
|
||||||
@rm -f .depend
|
@rm -f .depend
|
||||||
@mkdir -p include/config
|
@mkdir -p include/config
|
||||||
|
Loading…
x
Reference in New Issue
Block a user