1.1 --- a/config/config.mk	Mon Nov 19 11:21:31 2012 +0100
     1.2 +++ b/config/config.mk	Mon Nov 19 22:13:11 2012 +0100
     1.3 @@ -15,17 +15,17 @@
     1.4  $(STATIC_CONFIG_FILES): config
     1.5  
     1.6  # Build a list of per-component-type source config files
     1.7 -ARCH_CONFIG_FILES     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/arch/*.in))
     1.8 -ARCH_CONFIG_FILES_2   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/arch/*.in.2))
     1.9 -KERNEL_CONFIG_FILES   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/kernel/*.in))
    1.10 -KERNEL_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/kernel/*.in.2))
    1.11 -CC_CONFIG_FILES       = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in))
    1.12 -CC_CONFIG_FILES_2     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in.2))
    1.13 -BINUTILS_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/binutils/*.in))
    1.14 +ARCH_CONFIG_FILES       = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/arch/*.in))
    1.15 +ARCH_CONFIG_FILES_2     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/arch/*.in.2))
    1.16 +KERNEL_CONFIG_FILES     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/kernel/*.in))
    1.17 +KERNEL_CONFIG_FILES_2   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/kernel/*.in.2))
    1.18 +CC_CONFIG_FILES         = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in))
    1.19 +CC_CONFIG_FILES_2       = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/cc/*.in.2))
    1.20 +BINUTILS_CONFIG_FILES   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/binutils/*.in))
    1.21  BINUTILS_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/binutils/*.in.2))
    1.22 -LIBC_CONFIG_FILES     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in))
    1.23 -LIBC_CONFIG_FILES_2   = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in.2))
    1.24 -DEBUG_CONFIG_FILES    = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/debug/*.in))
    1.25 +LIBC_CONFIG_FILES       = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in))
    1.26 +LIBC_CONFIG_FILES_2     = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/libc/*.in.2))
    1.27 +DEBUG_CONFIG_FILES      = $(patsubst $(CT_LIB_DIR)/%,%,$(wildcard $(CT_LIB_DIR)/config/debug/*.in))
    1.28  
    1.29  # Build the list of generated config files
    1.30  GEN_CONFIG_FILES = config.gen/arch.in     \
    1.31 @@ -61,12 +61,12 @@
    1.32  #-----------------------------------------------------------
    1.33  # Build list of per-component-type items to easily build generated files
    1.34  
    1.35 -ARCHS   = $(patsubst config/arch/%.in,%,$(ARCH_CONFIG_FILES))
    1.36 -KERNELS = $(patsubst config/kernel/%.in,%,$(KERNEL_CONFIG_FILES))
    1.37 -CCS     = $(patsubst config/cc/%.in,%,$(CC_CONFIG_FILES))
    1.38 +ARCHS     = $(patsubst config/arch/%.in,%,$(ARCH_CONFIG_FILES))
    1.39 +KERNELS   = $(patsubst config/kernel/%.in,%,$(KERNEL_CONFIG_FILES))
    1.40 +CCS       = $(patsubst config/cc/%.in,%,$(CC_CONFIG_FILES))
    1.41  BINUTILSS = $(patsubst config/binutils/%.in,%,$(BINUTILS_CONFIG_FILES))
    1.42 -LIBCS   = $(patsubst config/libc/%.in,%,$(LIBC_CONFIG_FILES))
    1.43 -DEBUGS  = $(patsubst config/debug/%.in,%,$(DEBUG_CONFIG_FILES))
    1.44 +LIBCS     = $(patsubst config/libc/%.in,%,$(LIBC_CONFIG_FILES))
    1.45 +DEBUGS    = $(patsubst config/debug/%.in,%,$(DEBUG_CONFIG_FILES))
    1.46  
    1.47  #-----------------------------------------------------------
    1.48  # The rules for the generated config files