From bf553ae72bdce5de054cdbbde09b60a1384ad93a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 27 Jan 2009 20:38:48 +0000 Subject: Fix white space damage after switching to using paths found by ./configure. /trunk/samples/samples.mk | 2 1 1 0 /trunk/config/config.mk | 104 52 52 0 ++++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/config/config.mk b/config/config.mk index 7581234..5997056 100644 --- a/config/config.mk +++ b/config/config.mk @@ -75,38 +75,38 @@ TOOLS = $(patsubst config/tools/%.in,%,$(TOOL_CONFIG_FILES)) # $(call build_gen_choice_in,config.gen/kernel.in,Target OS,KERNEL,config/kernel,$(KERNELS)) define build_gen_choice_in @$(ECHO) ' IN $(1)' - $(SILENT)(echo "# $(2) menu"; \ - echo "# Generated file, do not edit!!!"; \ - echo ""; \ - echo "choice"; \ - echo " bool"; \ - echo " prompt \"$(2)\""; \ - echo ""; \ - for entry in $(5); do \ - file="$(4)/$${entry}.in"; \ - _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ - echo "config $(3)_$${_entry}"; \ - echo " bool"; \ - printf " prompt \"$${entry}"; \ - if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \ - echo " (EXPERIMENTAL)\""; \ - echo " depends on EXPERIMENTAL"; \ - else \ - echo "\""; \ - fi; \ - done; \ - echo ""; \ - echo "endchoice"; \ - for entry in $(5); do \ - file="$(4)/$${entry}.in"; \ - _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ - echo ""; \ - echo "if $(3)_$${_entry}"; \ - echo "config $(3)"; \ - echo " default \"$${entry}\" if $(3)_$${_entry}"; \ - echo "source $${file}"; \ - echo "endif"; \ - done; \ + $(SILENT)(echo "# $(2) menu"; \ + echo "# Generated file, do not edit!!!"; \ + echo ""; \ + echo "choice"; \ + echo " bool"; \ + echo " prompt \"$(2)\""; \ + echo ""; \ + for entry in $(5); do \ + file="$(4)/$${entry}.in"; \ + _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ + echo "config $(3)_$${_entry}"; \ + echo " bool"; \ + printf " prompt \"$${entry}"; \ + if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \ + echo " (EXPERIMENTAL)\""; \ + echo " depends on EXPERIMENTAL"; \ + else \ + echo "\""; \ + fi; \ + done; \ + echo ""; \ + echo "endchoice"; \ + for entry in $(5); do \ + file="$(4)/$${entry}.in"; \ + _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ + echo ""; \ + echo "if $(3)_$${_entry}"; \ + echo "config $(3)"; \ + echo " default \"$${entry}\" if $(3)_$${_entry}"; \ + echo "source $${file}"; \ + echo "endif"; \ + done; \ ) >$(1) endef @@ -122,26 +122,26 @@ endef # $(call build_gen_menu_in,config.gen/tools.in,Tools,TOOL,config/tools,$(TOOLS)) define build_gen_menu_in @$(ECHO) ' IN $(1)' - $(SILENT)(echo "# $(2) facilities menu"; \ - echo "# Generated file, do not edit!!!"; \ - echo ""; \ - for entry in $(5); do \ - file="$(4)/$${entry}.in"; \ - _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ - echo "menuconfig $(3)_$${_entry}"; \ - echo " bool"; \ - printf " prompt \"$${entry}"; \ - if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \ - echo " (EXPERIMENTAL)\""; \ - echo " depends on EXPERIMENTAL"; \ - else \ - echo "\""; \ - fi; \ - echo "if $(3)_$${_entry}"; \ - echo "source $${file}"; \ - echo "endif"; \ - echo ""; \ - done; \ + $(SILENT)(echo "# $(2) facilities menu"; \ + echo "# Generated file, do not edit!!!"; \ + echo ""; \ + for entry in $(5); do \ + file="$(4)/$${entry}.in"; \ + _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \ + echo "menuconfig $(3)_$${_entry}"; \ + echo " bool"; \ + printf " prompt \"$${entry}"; \ + if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \ + echo " (EXPERIMENTAL)\""; \ + echo " depends on EXPERIMENTAL"; \ + else \ + echo "\""; \ + fi; \ + echo "if $(3)_$${_entry}"; \ + echo "source $${file}"; \ + echo "endif"; \ + echo ""; \ + done; \ ) >$(1) endef diff --git a/samples/samples.mk b/samples/samples.mk index c8befba..6052ae9 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -76,7 +76,7 @@ $(CT_SAMPLES): echo ; \ echo '***********************************************************'; \ ) - $(SILENT)if $(grep) -E '^CT_EXPERIMENTAL=y$$' .config >/dev/null 2>&1; then \ + $(SILENT)if $(grep) -E '^CT_EXPERIMENTAL=y$$' .config >/dev/null 2>&1; then \ echo ; \ echo 'WARNING! This sample may enable experimental features.'; \ echo ' Please be sure to review the configuration prior'; \ -- cgit v0.10.2-6-g49f6