From bbf7b2ed167a462eaca5396130bc5d48b0628f1d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 16 Jun 2007 18:01:59 +0000
Subject: Rework the generated config file handling.


diff --git a/kconfig/Makefile b/kconfig/Makefile
index 0603b74..fa767e9 100644
--- a/kconfig/Makefile
+++ b/kconfig/Makefile
@@ -24,9 +24,8 @@ CONFIG_FILES = $(filter-out %debug.in,$(shell find $(CT_TOP_DIR)/config -type f
 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 @@ $(CT_TOP_DIR)/config/tools.in: $(TOOLS_CONFIG_FILES)
 	 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 @@ kconfig/conf: $(SHIPPED) kconfig/conf.c
 
 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)
-- 
cgit v0.10.2-6-g49f6