summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-05-21 15:05:49 +0000
committerBernhard Reutner-Fischer2006-05-21 15:05:49 +0000
commit4148afe04975c6003bde330db2b074d49f25f5d3 (patch)
tree54f886f06dd789749a81d3955686cc043ec03f1b
parenta1e130f122c7fdc69ddf9e9937458530eff185ac (diff)
downloadbusybox-4148afe04975c6003bde330db2b074d49f25f5d3.zip
busybox-4148afe04975c6003bde330db2b074d49f25f5d3.tar.gz
- fix wrong path to scripts/usage; It is in the builddir and not in the srcdir.
- flag .depend as .NOTPARALLEL to workaround bug in make-3.80 and make-3.81 Some more details on the second workaround (i.e. kludge): make-3.80 silently fails, while make-3.81 is at least self-conscious enough to admit: include/usage_compressed.h: .config scripts/usage # Implicit rule search has not been done. # File does not exist. # File has not been updated. # Dependencies commands running (THIS IS A BUG). # commands to execute (from `/home/cow/src/bb2/Makefile', line 430): $(Q)$(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_builddir)/scripts" > $@ I'm giving up on trying to run the rest of the prerequisites of .depend in parallel and just (try to) indicate that the prerequisites of .depend are not to be run in parallel. While this makes `make distclean defconfig;make -j´ work for me, it is not a real -- longterm -- solution; FIXME
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b13f793..77c2574 100644
--- a/Makefile
+++ b/Makefile
@@ -415,17 +415,21 @@ include/bbconfigopts.h: .config
endif
ifeq ($(strip $(CONFIG_FEATURE_COMPRESS_USAGE)),y)
-scripts/usage: $(top_srcdir)/scripts/usage.c
+USAGE_BIN:=scripts/usage
+$(USAGE_BIN): $(top_srcdir)/scripts/usage.c
$(do_link.h)
DEP_INCLUDES += include/usage_compressed.h
-include/usage_compressed.h: scripts/usage .config
- $(Q)$(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_srcdir)/scripts" > $@
+include/usage_compressed.h: .config $(USAGE_BIN)
+ $(Q)$(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_builddir)/scripts" > $@
endif # CONFIG_FEATURE_COMPRESS_USAGE
+# workaround alleged bug in make-3.80, make-3.81
+.NOTPARALLEL: .depend
+
depend dep: .depend
-.depend: scripts/bb_mkdep $(DEP_INCLUDES)
+.depend: scripts/bb_mkdep $(USAGE_BIN) $(DEP_INCLUDES)
$(disp_gen)
$(Q)rm -f .depend
$(Q)mkdir -p include/config