svn commit: trunk/busybox

[aldot at busybox.net]

Author: aldot
Date: 2006-05-21 08:05:49 -0700 (Sun, 21 May 2006)
New Revision: 15154

Log:
- 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?\194?\180 work for me, it is not a
real -- longterm -- solution; FIXME



Modified:
   trunk/busybox/Makefile


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-05-21 10:45:01 UTC (rev 15153)
+++ trunk/busybox/Makefile	2006-05-21 15:05:49 UTC (rev 15154)
@@ -415,17 +415,21 @@
 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