aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpgf <pgf@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-06 20:00:43 +0000
committerpgf <pgf@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-06 20:00:43 +0000
commite365c0b18061210faef2ffc5150c1701a1907f15 (patch)
tree27d199f901a06c8834a9032001fea02298547ed0
parent0f492c08c924fc73fe7c5866ccbaa123f6aadf7f (diff)
downloadbusybox-w32-e365c0b18061210faef2ffc5150c1701a1907f15.tar.gz
busybox-w32-e365c0b18061210faef2ffc5150c1701a1907f15.tar.bz2
busybox-w32-e365c0b18061210faef2ffc5150c1701a1907f15.zip
fix dependencies so that compressed usage gets rebuilt if
a) include/usage.h is changed, and b) after "make clean". git-svn-id: svn://busybox.net/trunk/busybox@15658 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e5f31d85e..3d3a24be3 100644
--- a/Makefile
+++ b/Makefile
@@ -436,13 +436,16 @@ endif
436 436
437ifeq ($(strip $(CONFIG_FEATURE_COMPRESS_USAGE)),y) 437ifeq ($(strip $(CONFIG_FEATURE_COMPRESS_USAGE)),y)
438USAGE_BIN:=scripts/usage 438USAGE_BIN:=scripts/usage
439$(USAGE_BIN): $(top_srcdir)/scripts/usage.c .config 439$(USAGE_BIN): $(top_srcdir)/scripts/usage.c .config \
440 $(top_srcdir)/include/usage.h
440 $(do_link.h) 441 $(do_link.h)
441 442
442DEP_INCLUDES += include/usage_compressed.h 443DEP_INCLUDES += include/usage_compressed.h
443 444
444include/usage_compressed.h: .config $(USAGE_BIN) $(top_srcdir)/scripts/usage_compressed 445include/usage_compressed.h: .config $(USAGE_BIN) \
445 $(Q)SED="$(SED)" $(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_builddir)/scripts" > $@ 446 $(top_srcdir)/scripts/usage_compressed
447 $(Q)SED="$(SED)" $(SHELL) $(top_srcdir)/scripts/usage_compressed \
448 "$(top_builddir)/scripts" > $@
446endif # CONFIG_FEATURE_COMPRESS_USAGE 449endif # CONFIG_FEATURE_COMPRESS_USAGE
447 450
448# workaround alleged bug in make-3.80, make-3.81 451# workaround alleged bug in make-3.80, make-3.81
@@ -470,7 +473,8 @@ clean:
470 docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \ 473 docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
471 docs/busybox.net/BusyBox.html busybox.links \ 474 docs/busybox.net/BusyBox.html busybox.links \
472 libbusybox.so* \ 475 libbusybox.so* \
473 .config.old busybox busybox_unstripped 476 .config.old busybox busybox_unstripped \
477 include/usage_compressed.h scripts/usage
474 - rm -r -f _install testsuite/links 478 - rm -r -f _install testsuite/links
475 - find . -name .\*.flags -o -name \*.o -o -name \*.om -o -name \*.syn \ 479 - find . -name .\*.flags -o -name \*.o -o -name \*.om -o -name \*.syn \
476 -o -name \*.os -o -name \*.osm -o -name \*.a | xargs rm -f 480 -o -name \*.os -o -name \*.osm -o -name \*.a | xargs rm -f