1.1 --- a/samples/samples.mk Fri Nov 21 15:37:46 2008 +0000
1.2 +++ b/samples/samples.mk Mon Jan 26 18:36:02 2009 +0000
1.3 @@ -39,7 +39,7 @@
1.4 # print the list of all available samples
1.5 PHONY += list-samples
1.6 list-samples: .FORCE
1.7 - @echo $(CT_SAMPLES) |sed -r -e 's/ /\n/g;' |sort
1.8 + @echo $(CT_SAMPLES) |$(sed) -r -e 's/ /\n/g;' |sort
1.9
1.10 wiki-samples:
1.11 $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w $(CT_SAMPLES)
1.12 @@ -76,7 +76,7 @@
1.13 echo ; \
1.14 echo '***********************************************************'; \
1.15 )
1.16 - $(SILENT)if grep -E '^CT_EXPERIMENTAL=y$$' .config >/dev/null 2>&1; then \
1.17 + $(SILENT)if $(grep) -E '^CT_EXPERIMENTAL=y$$' .config >/dev/null 2>&1; then \
1.18 echo ; \
1.19 echo 'WARNING! This sample may enable experimental features.'; \
1.20 echo ' Please be sure to review the configuration prior'; \
1.21 @@ -97,12 +97,12 @@
1.22 define build_sample
1.23 @$(ECHO) ' CONF $(1)'
1.24 $(SILENT)cp $(call sample_dir,$(1))/crosstool.config .config
1.25 - $(SILENT)sed -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(2)":;' .config
1.26 - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config
1.27 - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config
1.28 - $(SILENT)sed -i -r -e 's:^(CT_LOG_LEVEL_MAX)=.*$$:\1="ERROR":;' .config
1.29 - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config
1.30 - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config
1.31 + $(SILENT)$(sed) -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(2)":;' .config
1.32 + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config
1.33 + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config
1.34 + $(SILENT)$(sed) -i -r -e 's:^(CT_LOG_LEVEL_MAX)=.*$$:\1="ERROR":;' .config
1.35 + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config
1.36 + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config
1.37 $(SILENT)$(MAKE) -rf $(CT_NG) V=0 oldconfig
1.38 @$(ECHO) ' BUILD $(1)'
1.39 $(SILENT)$(MAKE) -rf $(CT_NG) V=0 build
1.40 @@ -131,5 +131,5 @@
1.41
1.42 # Build all samples, overiding the number of // jobs per sample
1.43 build-all.%:
1.44 - $(SILENT)$(MAKE) -rf $(CT_NG) V=$(V) $(shell echo "$(@)" |sed -r -e 's|^([^.]+)\.([[:digit:]]+)$$|\1 CT_JOBS=\2|;')
1.45 + $(SILENT)$(MAKE) -rf $(CT_NG) V=$(V) $(shell echo "$(@)" |$(sed) -r -e 's|^([^.]+)\.([[:digit:]]+)$$|\1 CT_JOBS=\2|;')
1.46