# HG changeset patch # User "Yann E. MORIN" # Date 1182016919 0 # Node ID 6daa8b5df1b48da3199e00966edbe15e58073f24 # Parent 14f6a1d442f28af34e308e523e87d8a4e016e7d5 Rework the generated config file handling. diff -r 14f6a1d442f2 -r 6daa8b5df1b4 kconfig/Makefile --- a/kconfig/Makefile Sat Jun 16 18:00:35 2007 +0000 +++ b/kconfig/Makefile Sat Jun 16 18:01:59 2007 +0000 @@ -24,9 +24,8 @@ DEBUG_CONFIG_FILES = $(shell find $(CT_TOP_DIR)/config/debug -type f -name '*.in') TOOLS_CONFIG_FILES = $(shell find $(CT_TOP_DIR)/config/tools -type f -name '*.in') -.PHONY: generated_config_files -generated_config_files: $(CT_TOP_DIR)/config/debug.in \ - $(CT_TOP_DIR)/config/tools.in +GEN_CONFIG_FILES=$(CT_TOP_DIR)/config/debug.in \ + $(CT_TOP_DIR)/config/tools.in $(CT_TOP_DIR)/config/debug.in: $(DEBUG_CONFIG_FILES) @echo "# Debug facilities menu" >$@ @@ -46,15 +45,18 @@ done >>$@ @echo "endmenu" >>$@ -menuconfig: $(obj)/mconf generated_config_files +menuconfig: $(obj)/mconf $(GEN_CONFIG_FILES) @$< $(KCONFIG_TOP) -config: $(obj)/conf generated_config_files +config: $(obj)/conf $(GEN_CONFIG_FILES) @$< $(KCONFIG_TOP) -oldconfig: $(obj)/conf generated_config_files +oldconfig: $(obj)/conf $(GEN_CONFIG_FILES) @$< -s $(KCONFIG_TOP) +defoldconfig:$(obj)/conf $(GEN_CONFIG_FILES) + @$< -s $(KCONFIG_TOP) >/dev/null + # Help text used by make help help:: @echo 'General purpose configuration targets:' @@ -81,4 +83,4 @@ clean:: @rm -f $(wildcard kconfig/*zconf*.c) kconfig/{conf,mconf} - @rm -f "$(CT_TOP_DIR)/config/debug.in" "$(CT_TOP_DIR)/config/tools.in" + @rm -f $(GEN_CONFIG_FILES)