tools: move sstrip to the binary utilities menu

sstrip is now alone in its 'tools' menu, and we will probably never gain
any other 'tool'. Besides, sstrip is just strip, but a little bit more
agressive, so it deserves going to the 'binary utilities' menu.

5 files changed, 14 insertions, 16 deletions

diff --git a/config/binutils.in b/config/binutils.in
index a0fe0ef6..f09bd118 100644
--- a/config/binutils.in
+++ b/config/binutils.in
@@ -40,5 +40,6 @@ endchoice
 
 source config/binutils/binutils.in
 source config/binutils/elf2flt.in
+source config/binutils/sstrip.in
 
 endmenu
diff --git a/config/tools/sstrip.in b/config/binutils/sstrip.in
index 79687998..8d643e4f 100644
--- a/config/tools/sstrip.in
+++ b/config/binutils/sstrip.in
@@ -1,11 +1,17 @@
 # Configuration file for sstrip tool facility
 # depends on ! BACKEND
 
-config TOOL_sstrip
+comment "sstrip"
+
+config SSTRIP
+    bool
+    prompt "sstrip"
     help
       The sstrip utility, to maximise the striping of ELF binaries
       (executables and libraries).
 
+if SSTRIP
+
 choice
     bool
     prompt "Use sstrip from:"
@@ -40,3 +46,5 @@ config SSTRIP_ELFKICKERS_VERSION
     default "2.0a"
 
 endif
+
+endif # SSTRIP
diff --git a/config/config.in b/config/config.in
index e4f1de95..d7f3bc78 100644
--- a/config/config.in
+++ b/config/config.in
@@ -6,6 +6,5 @@ source config/binutils.in
 source config/cc.in
 source config/libc.in
 source config/debug.in
-source config/tools.in
 source config/companion_libs.in
 source config/companion_tools.in
diff --git a/config/config.mk b/config/config.mk
index 6945d095..f8265b36 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -19,14 +19,12 @@ KERNEL_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/conf
 CC_CONFIG_FILES     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in))
 LIBC_CONFIG_FILES   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in))
 DEBUG_CONFIG_FILES  = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/debug/*.in))
-TOOL_CONFIG_FILES   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/tools/*.in))
 
 # Build the list of generated config files
 GEN_CONFIG_FILES = config.gen/arch.in     \
                    config.gen/kernel.in   \
                    config.gen/cc.in       \
                    config.gen/libc.in     \
-                   config.gen/tools.in    \
                    config.gen/debug.in
 # ... and how to access them:
 # Generated files depends on config.mk (this file) because it has the
@@ -57,7 +55,6 @@ KERNELS = $(patsubst config/kernel/%.in,%,$(KERNEL_CONFIG_FILES))
 CCS     = $(patsubst config/cc/%.in,%,$(CC_CONFIG_FILES))
 LIBCS   = $(patsubst config/libc/%.in,%,$(LIBC_CONFIG_FILES))
 DEBUGS  = $(patsubst config/debug/%.in,%,$(DEBUG_CONFIG_FILES))
-TOOLS   = $(patsubst config/tools/%.in,%,$(TOOL_CONFIG_FILES))
 
 #-----------------------------------------------------------
 # Helper functions to ease building generated config files
@@ -116,12 +113,11 @@ endef
 # the given list, source-ing the associated files conditionnaly:
 # $1 : destination file
 # $2 : name of entries family (eg. Tools, Debug...)
-# $3 : prefix for the menu entries (eg. TOOL, DEBUG)
+# $3 : prefix for the menu entries (eg. DEBUG)
 # $4 : base directory containing config files
-# $5 : list of config entries (eg. for tools: "libelf sstrip"..., and for
-#      debug: "dmalloc duma gdb"...)
-# Example to build the tools generated config file:
-# $(call build_gen_menu_in,config.gen/tools.in,Tools,TOOL,config/tools,$(TOOLS))
+# $5 : list of config entries (eg. for debug: "dmalloc duma gdb"...)
+# Example to build the generated debug config file:
+# $(call build_gen_menu_in,config.gen/debug.in,Debug,DEBUG,config/debug,$(DEBUGS))
 define build_gen_menu_in
 	@$(ECHO) '  IN    $(1)'
 	$(SILENT)(echo "# $(2) facilities menu";                                \
@@ -160,9 +156,6 @@ config.gen/cc.in: $(CC_CONFIG_FILES)
 config.gen/libc.in: $(LIBC_CONFIG_FILES)
 	$(call build_gen_choice_in,$@,C library,LIBC,config/libc,$(LIBCS))
 
-config.gen/tools.in: $(TOOL_CONFIG_FILES)
-	$(call build_gen_menu_in,$@,Tools,TOOL,config/tools,$(TOOLS))
-
 config.gen/debug.in: $(DEBUG_CONFIG_FILES)
 	$(call build_gen_menu_in,$@,Debug,DEBUG,config/debug,$(DEBUGS))
 
diff --git a/config/tools.in b/config/tools.in
deleted file mode 100644
index fe736090..00000000
--- a/config/tools.in
+++ /dev/null
@@ -1,3 +0,0 @@
-menu "Tools facilities"
-source config.gen/tools.in
-endmenu