1.1 --- a/config/config.mk Thu Mar 26 18:58:13 2009 +0000
1.2 +++ b/config/config.mk Wed Mar 17 00:28:14 2010 +0100
1.3 @@ -19,14 +19,12 @@
1.4 CC_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in))
1.5 LIBC_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in))
1.6 DEBUG_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/debug/*.in))
1.7 -TOOL_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/tools/*.in))
1.8
1.9 # Build the list of generated config files
1.10 GEN_CONFIG_FILES = config.gen/arch.in \
1.11 config.gen/kernel.in \
1.12 config.gen/cc.in \
1.13 config.gen/libc.in \
1.14 - config.gen/tools.in \
1.15 config.gen/debug.in
1.16 # ... and how to access them:
1.17 # Generated files depends on config.mk (this file) because it has the
1.18 @@ -57,7 +55,6 @@
1.19 CCS = $(patsubst config/cc/%.in,%,$(CC_CONFIG_FILES))
1.20 LIBCS = $(patsubst config/libc/%.in,%,$(LIBC_CONFIG_FILES))
1.21 DEBUGS = $(patsubst config/debug/%.in,%,$(DEBUG_CONFIG_FILES))
1.22 -TOOLS = $(patsubst config/tools/%.in,%,$(TOOL_CONFIG_FILES))
1.23
1.24 #-----------------------------------------------------------
1.25 # Helper functions to ease building generated config files
1.26 @@ -116,12 +113,11 @@
1.27 # the given list, source-ing the associated files conditionnaly:
1.28 # $1 : destination file
1.29 # $2 : name of entries family (eg. Tools, Debug...)
1.30 -# $3 : prefix for the menu entries (eg. TOOL, DEBUG)
1.31 +# $3 : prefix for the menu entries (eg. DEBUG)
1.32 # $4 : base directory containing config files
1.33 -# $5 : list of config entries (eg. for tools: "libelf sstrip"..., and for
1.34 -# debug: "dmalloc duma gdb"...)
1.35 -# Example to build the tools generated config file:
1.36 -# $(call build_gen_menu_in,config.gen/tools.in,Tools,TOOL,config/tools,$(TOOLS))
1.37 +# $5 : list of config entries (eg. for debug: "dmalloc duma gdb"...)
1.38 +# Example to build the generated debug config file:
1.39 +# $(call build_gen_menu_in,config.gen/debug.in,Debug,DEBUG,config/debug,$(DEBUGS))
1.40 define build_gen_menu_in
1.41 @$(ECHO) ' IN $(1)'
1.42 $(SILENT)(echo "# $(2) facilities menu"; \
1.43 @@ -160,9 +156,6 @@
1.44 config.gen/libc.in: $(LIBC_CONFIG_FILES)
1.45 $(call build_gen_choice_in,$@,C library,LIBC,config/libc,$(LIBCS))
1.46
1.47 -config.gen/tools.in: $(TOOL_CONFIG_FILES)
1.48 - $(call build_gen_menu_in,$@,Tools,TOOL,config/tools,$(TOOLS))
1.49 -
1.50 config.gen/debug.in: $(DEBUG_CONFIG_FILES)
1.51 $(call build_gen_menu_in,$@,Debug,DEBUG,config/debug,$(DEBUGS))
1.52