- let the scripts be prerequisites of the files the generate

- make sure that bbconfig isn't too stupid

diff --git a/Makefile b/Makefile
index e5ac831678b82fa98743b5af3256eddfdef54b7b..55f45f945ec84711ad12e8a1fefc6c4404945cd3 100644 (file)
--- 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 be5d9d1776437da04d9dc9d18a6bc06682951eec..88365f62c34691aa950eb30e891dea69a9756b4f 100755 (executable)
--- 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 "\";"