aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-05-21 15:05:49 +0000
committeraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-05-21 15:05:49 +0000
commit65080523418d903db8dc64adc60b8b4cbceb3061 (patch)
tree54f886f06dd789749a81d3955686cc043ec03f1b
parenta847912da9a43e2d416570800e99951c4ec30f62 (diff)
downloadbusybox-w32-65080523418d903db8dc64adc60b8b4cbceb3061.tar.gz
busybox-w32-65080523418d903db8dc64adc60b8b4cbceb3061.tar.bz2
busybox-w32-65080523418d903db8dc64adc60b8b4cbceb3061.zip
- 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 git-svn-id: svn://busybox.net/trunk/busybox@15154 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b13f79323..77c25742b 100644
--- a/Makefile
+++ b/Makefile
@@ -415,17 +415,21 @@ include/bbconfigopts.h: .config
415endif 415endif
416 416
417ifeq ($(strip $(CONFIG_FEATURE_COMPRESS_USAGE)),y) 417ifeq ($(strip $(CONFIG_FEATURE_COMPRESS_USAGE)),y)
418scripts/usage: $(top_srcdir)/scripts/usage.c 418USAGE_BIN:=scripts/usage
419$(USAGE_BIN): $(top_srcdir)/scripts/usage.c
419 $(do_link.h) 420 $(do_link.h)
420 421
421DEP_INCLUDES += include/usage_compressed.h 422DEP_INCLUDES += include/usage_compressed.h
422 423
423include/usage_compressed.h: scripts/usage .config 424include/usage_compressed.h: .config $(USAGE_BIN)
424 $(Q)$(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_srcdir)/scripts" > $@ 425 $(Q)$(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_builddir)/scripts" > $@
425endif # CONFIG_FEATURE_COMPRESS_USAGE 426endif # CONFIG_FEATURE_COMPRESS_USAGE
426 427
428# workaround alleged bug in make-3.80, make-3.81
429.NOTPARALLEL: .depend
430
427depend dep: .depend 431depend dep: .depend
428.depend: scripts/bb_mkdep $(DEP_INCLUDES) 432.depend: scripts/bb_mkdep $(USAGE_BIN) $(DEP_INCLUDES)
429 $(disp_gen) 433 $(disp_gen)
430 $(Q)rm -f .depend 434 $(Q)rm -f .depend
431 $(Q)mkdir -p include/config 435 $(Q)mkdir -p include/config