aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-15 21:35:35 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-15 21:35:35 +0000
commit42f091a76120b4bf2ab7466dfaaf8907f9d9b189 (patch)
treeaac37d347342f06debbf290aedc3200f0ff33846
parent39218932b1e99be6ef91329f7fb1beeeb40941c1 (diff)
downloadbusybox-42f091a76120b4bf2ab7466dfaaf8907f9d9b189.tar.gz
- let the scripts be prerequisites of the files the generate
- make sure that bbconfig isn't too stupid
-rw-r--r--Makefile4
-rwxr-xr-xscripts/config/mkconfigs2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e5ac83167..55f45f945 100644
--- a/Makefile
+++ b/Makefile
@@ -430,7 +430,7 @@ DEP_INCLUDES := include/bb_config.h
ifeq ($(strip $(CONFIG_BBCONFIG)),y)
DEP_INCLUDES += include/bbconfigopts.h
-include/bbconfigopts.h: .config
+include/bbconfigopts.h: .config $(top_srcdir)/scripts/config/mkconfigs
$(disp_gen)
$(Q)$(top_srcdir)/scripts/config/mkconfigs > $@
endif
@@ -442,7 +442,7 @@ $(USAGE_BIN): $(top_srcdir)/scripts/usage.c .config
DEP_INCLUDES += include/usage_compressed.h
-include/usage_compressed.h: .config $(USAGE_BIN)
+include/usage_compressed.h: .config $(USAGE_BIN) $(top_srcdir)/scripts/usage_compressed
$(Q)SED="$(SED)" $(SHELL) $(top_srcdir)/scripts/usage_compressed "$(top_builddir)/scripts" > $@
endif # CONFIG_FEATURE_COMPRESS_USAGE
diff --git a/scripts/config/mkconfigs b/scripts/config/mkconfigs
index be5d9d177..88365f62c 100755
--- a/scripts/config/mkconfigs
+++ b/scripts/config/mkconfigs
@@ -60,7 +60,7 @@ echo \
*
*/"
-echo "static char const bbconfig_config[] ="
+echo "static const char const * bbconfig_config ="
echo "\"\\"
echo "`sed 's/\"/\\\\\"/g' $config | grep "^#\? \?CONFIG_" | awk '{ print $0 "\\\\n\\\\" }' `"
echo "\";"