Simplify the Tools and Debug facilities menu entries:

 - each config file no longer have to define their own 'menuconfig foo - if FOO - endif' gym
 - each build script no longer has to say wether they are enabled
 - generation of the 'menuconfig' entries for the Tools and Debug facilities now uses the same code
Some re-ordering of the code to be consistent with the steps ordering (tools, then debug).

 /trunk/kconfig/kconfig.mk                  |   66    43    23     0 +++++++++++++++++++++++-------------
 /trunk/scripts/build/debug.sh              |   14     9     5     0 +++++---
 /trunk/scripts/build/tools/000-template.sh |    7     0     7     0 ----
 /trunk/scripts/build/tools/100-libelf.sh   |    3     0     3     0 --
 /trunk/scripts/build/tools/200-sstrip.sh   |    2     0     2     0 -
 /trunk/scripts/build/debug/000-template.sh |    7     0     7     0 ----
 /trunk/scripts/build/debug/100-dmalloc.sh  |    3     0     3     0 --
 /trunk/scripts/build/debug/400-ltrace.sh   |    3     0     3     0 --
 /trunk/scripts/build/debug/300-gdb.sh      |    3     0     3     0 --
 /trunk/scripts/build/debug/500-strace.sh   |    3     0     3     0 --
 /trunk/scripts/build/debug/200-duma.sh     |    3     0     3     0 --
 /trunk/scripts/build/tools.sh              |   14     9     5     0 +++++---
 /trunk/scripts/crosstool.sh                |    2     1     1     0
 /trunk/config/debug/ltrace.in              |   14     3    11     0 ++------
 /trunk/config/debug/dmalloc.in             |    9     1     8     0 +----
 /trunk/config/debug/gdb.in                 |    9     1     8     0 +----
 /trunk/config/debug/strace.in              |   10     1     9     0 -----
 /trunk/config/debug/duma.in                |   10     1     9     0 -----
 /trunk/config/tools/libelf.in              |   12     2    10     0 +------
 /trunk/config/tools/sstrip.in              |   10     1     9     0 -----
 /trunk/config/config.in                    |    4     2     2     0 +-
 21 files changed, 74 insertions(+), 134 deletions(-)

8 files changed, 12 insertions, 66 deletions

diff --git a/config/config.in b/config/config.in
index cd73a3e6..16a62f28 100644
--- a/config/config.in
+++ b/config/config.in
@@ -6,5 +6,5 @@ source config/gmp_mpfr.in
 source config/binutils.in
 source config/cc.in
 source config/libc.in
-source config.gen/tools.in
-source config.gen/debug.in
+source config/tools.in
+source config/debug.in
diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in
index 692c2292..7f4751f5 100644
--- a/config/debug/dmalloc.in
+++ b/config/debug/dmalloc.in
@@ -1,12 +1,7 @@
 # dmalloc debug facility
 
-menuconfig DMALLOC
+config DEBUG_dmalloc
     bool
-    prompt "dmalloc"
-    default n
-    depends on ! BARE_METAL
-
-if DMALLOC
 
 choice
     bool
@@ -31,5 +26,3 @@ config DMALLOC_VERSION
     default "5.5.2" if DMALLOC_V_5_5_2
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
-
-endif
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 5de4e7c0..eebb6210 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -1,17 +1,11 @@
 # D.U.M.A. - Detect Unintended Memory Access - Memory checker
 
-menuconfig DUMA
-    bool
-    prompt "D.U.M.A."
-    default n
-    depends on ! BARE_METAL
+config DEBUG_duma
     help
       D.U.M.A. - Detect Unintended Memory Access
       A memory bound checker, with additional features.
       Formerly known as Electric Fence.
 
-if DUMA
-
 config DUMA_A
     bool
     prompt "Build a static library"
@@ -55,5 +49,3 @@ config DUMA_VERSION
     default "2_5_14" if DUMA_V_2_5_14
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
-
-endif
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 0d015831..41702bf8 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -1,14 +1,9 @@
 # GDB menu
 
-menuconfig GDB
-    bool
-    prompt "gdb"
-    default n
+config DEBUG_gdb
     help
       Enable gdb for the target
 
-if GDB
-
 config GDB_CROSS
     bool
     prompt "Cross-gdb"
@@ -167,5 +162,3 @@ config NCURSES_VERSION
     default "5.6" if NCURSES_V_5_6
 
 endif # GDB_NATIVE --> ncurses
-
-endif
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index dbc90ea5..ebe00e84 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -1,20 +1,14 @@
+# EXPERIMENTAL
 # ltrace
 
-menuconfig LTRACE
-    bool
-    prompt "ltrace (EXPERIMENTAL)"
-    default n
-    depends on EXPERIMENTAL
-    depends on ! BARE_METAL
-    select LIBELF
+config DEBUG_ltrace
+    select TOOL_libelf
     help
       ltrace is currently BROKEN! It depends on libelf, and I don't
       know how to configure/compile that so that ltrace can successfully
       use it. If you manage to build ltrace (and libelf!), please be so
       kind as to tell me! Thank you!
 
-if LTRACE
-
 choice
     bool
     prompt "ltrace version"
@@ -38,5 +32,3 @@ config LTRACE_VERSION
     default "0.4" if LTRACE_V_0_4
 # CT_INSERT_VERSION_STRING_ABOVE
 # # Don't remove above line!
-
-endif
diff --git a/config/debug/strace.in b/config/debug/strace.in
index 055bb222..49be38cc 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -1,12 +1,6 @@
 # strace
 
-menuconfig STRACE
-    bool
-    prompt "strace"
-    default n
-    depends on ! BARE_METAL
-
-if STRACE
+config DEBUG_strace
 
 choice
     bool
@@ -42,5 +36,3 @@ config STRACE_VERSION
     default "4.5.16" if STRACE_V_4_5_16
 # CT_INSERT_VERSION_STRING_ABOVE
 # # Don't remove above line!
-
-endif
diff --git a/config/tools/libelf.in b/config/tools/libelf.in
index 213fdc5f..91579f7f 100644
--- a/config/tools/libelf.in
+++ b/config/tools/libelf.in
@@ -1,11 +1,7 @@
+# EXPERIMENTAL
 # libelf config file
 
-menuconfig LIBELF
-    bool
-    prompt "libelf (BROKEN)"
-    default n
-    depends on EXPERIMENTAL
-    depends on ! BARE_METAL
+config TOOL_libelf
     help
       libelf lets you read, modify or create ELF files in an
       architecture-independent way.
@@ -14,8 +10,6 @@ menuconfig LIBELF
       please be so kind as to tell me. (By working, I mean it is
       useable at least by ltrace.) Thank you!
 
-if LIBELF
-
 choice
     bool
     prompt "libelf version"
@@ -44,5 +38,3 @@ config LIBELF_VERSION
     default "0.8.10" if LIBELF_V_0_8_10
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
-
-endif
diff --git a/config/tools/sstrip.in b/config/tools/sstrip.in
index 9b7d9d6c..f78330f6 100644
--- a/config/tools/sstrip.in
+++ b/config/tools/sstrip.in
@@ -1,16 +1,10 @@
 # Configuration file for sstrip tool facility
 
-menuconfig SSTRIP
-    bool
-    prompt "sstrip"
-    depends on ! BARE_METAL
-    default n
+config TOOL_sstrip
     help
       The sstrip utility, to maximise the striping of ELF binaries
       (executables and libraries).
 
-if SSTRIP
-
 choice
     bool
     prompt "Use sstrip from:"
@@ -44,5 +38,3 @@ config SSTRIP_ELFKICKERS_VERSION
     default "2.0a"
 
 endif
-
-endif