1.1 --- a/kconfig/kconfig.mk Fri Oct 03 12:30:29 2008 +0000
1.2 +++ b/kconfig/kconfig.mk Sun Oct 05 15:32:00 2008 +0000
1.3 @@ -19,7 +19,7 @@
1.4 endif
1.5
1.6 # Build a list of all config files
1.7 -ARCH_CONFIG_FILES = $(wildcard $(CT_LIB_DIR)/config/arch/*/config.in)
1.8 +ARCH_CONFIG_FILES = $(wildcard $(CT_LIB_DIR)/config/arch/*.in)
1.9 KERN_CONFIG_FILES = $(wildcard $(CT_LIB_DIR)/config/kernel/*.in)
1.10 DEBUG_CONFIG_FILES = $(wildcard $(CT_LIB_DIR)/config/debug/*.in)
1.11 TOOLS_CONFIG_FILES = $(wildcard $(CT_LIB_DIR)/config/tools/*.in)
1.12 @@ -33,7 +33,7 @@
1.13 CONFIG_FILES=$(STATIC_CONFIG_FILES) $(GEN_CONFIG_FILES)
1.14
1.15 # Build list of items
1.16 -ARCHS = $(patsubst $(CT_LIB_DIR)/config/arch/%/config.in,%,$(ARCH_CONFIG_FILES))
1.17 +ARCHS = $(patsubst $(CT_LIB_DIR)/config/arch/%.in,%,$(ARCH_CONFIG_FILES))
1.18 KERNELS = $(patsubst $(CT_LIB_DIR)/config/kernel/%.in,%,$(KERN_CONFIG_FILES))
1.19
1.20 $(GEN_CONFIG_FILES): $(CT_TOP_DIR)/config.gen \
1.21 @@ -44,27 +44,27 @@
1.22
1.23 $(CT_TOP_DIR)/config.gen/arch.in: $(ARCH_CONFIG_FILES)
1.24 @echo ' IN config.gen/arch.in'
1.25 - @(echo "# Architectures menu"; \
1.26 - echo "# Generated file, do not edit!!!"; \
1.27 - echo ""; \
1.28 - for arch in $(ARCHS); do \
1.29 - _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;'); \
1.30 - echo "config ARCH_$${_arch}"; \
1.31 - echo " bool"; \
1.32 - printf " prompt \"$${arch}"; \
1.33 - if grep -E '^# +EXPERIMENTAL$$' config/arch/$${arch}/config.in >/dev/null 2>&1; then \
1.34 - echo " (EXPERIMENTAL)\""; \
1.35 - echo " depends on EXPERIMENTAL"; \
1.36 - else \
1.37 - echo "\""; \
1.38 - fi; \
1.39 - echo "if ARCH_$${_arch}"; \
1.40 - echo "config ARCH"; \
1.41 - echo " default \"$${arch}\" if ARCH_$${_arch}"; \
1.42 - echo "source config/arch/$${arch}/config.in"; \
1.43 - echo "endif"; \
1.44 - echo ""; \
1.45 - done; \
1.46 + @(echo "# Architectures menu"; \
1.47 + echo "# Generated file, do not edit!!!"; \
1.48 + echo ""; \
1.49 + for arch in $(ARCHS); do \
1.50 + _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;'); \
1.51 + echo "config ARCH_$${_arch}"; \
1.52 + echo " bool"; \
1.53 + printf " prompt \"$${arch}"; \
1.54 + if grep -E '^# +EXPERIMENTAL$$' config/arch/$${arch}.in >/dev/null 2>&1; then \
1.55 + echo " (EXPERIMENTAL)\""; \
1.56 + echo " depends on EXPERIMENTAL"; \
1.57 + else \
1.58 + echo "\""; \
1.59 + fi; \
1.60 + echo "if ARCH_$${_arch}"; \
1.61 + echo "config ARCH"; \
1.62 + echo " default \"$${arch}\" if ARCH_$${_arch}"; \
1.63 + echo "source config/arch/$${arch}.in"; \
1.64 + echo "endif"; \
1.65 + echo ""; \
1.66 + done; \
1.67 ) >$@
1.68
1.69 $(CT_TOP_DIR)/config.gen/kernel.in: $(KERN_CONFIG_FILES)