diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-01-26 18:36:02 +0000 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-01-26 18:36:02 +0000 |
| commit | c7a1e6a4da2d341cae16d86db1db3bbf4334ffe2 (patch) | |
| tree | a41cf6f252ebf26f443eeb1c9266e42f0405304a /samples/samples.mk | |
| parent | 44596c425f79f0c92fdbfcd6d931105ac52c338d (diff) | |
| download | crosstool-ng-c7a1e6a4da2d341cae16d86db1db3bbf4334ffe2.tar.gz crosstool-ng-c7a1e6a4da2d341cae16d86db1db3bbf4334ffe2.tar.bz2 crosstool-ng-c7a1e6a4da2d341cae16d86db1db3bbf4334ffe2.zip | |
Use the paths found by ./configure in the ct-ng.in makefile script and its fragments.
/trunk/kconfig/kconfig.mk | 2 1 1 0 +-
/trunk/samples/samples.mk | 18 9 9 0 +++++++++---------
/trunk/config/config.mk | 10 5 5 0 +++++-----
/trunk/ct-ng.in | 22 13 9 0 +++++++++++++---------
4 files changed, 28 insertions(+), 24 deletions(-)
Diffstat (limited to 'samples/samples.mk')
| -rw-r--r-- | samples/samples.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/samples/samples.mk b/samples/samples.mk index 29b7dbea..c8befbaa 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -39,7 +39,7 @@ $(patsubst %,show-%,$(CT_SAMPLES)): # print the list of all available samples PHONY += list-samples list-samples: .FORCE - @echo $(CT_SAMPLES) |sed -r -e 's/ /\n/g;' |sort + @echo $(CT_SAMPLES) |$(sed) -r -e 's/ /\n/g;' |sort wiki-samples: $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w $(CT_SAMPLES) @@ -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'; \ @@ -97,12 +97,12 @@ $(CT_SAMPLES): define build_sample @$(ECHO) ' CONF $(1)' $(SILENT)cp $(call sample_dir,$(1))/crosstool.config .config - $(SILENT)sed -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(2)":;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config - $(SILENT)sed -i -r -e 's:^(CT_LOG_LEVEL_MAX)=.*$$:\1="ERROR":;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config - $(SILENT)sed -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config + $(SILENT)$(sed) -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(2)":;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_ERROR).*$$:\1=y:;' .config + $(SILENT)$(sed) -i -r -e 's:^(CT_LOG_LEVEL_MAX)=.*$$:\1="ERROR":;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config + $(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config $(SILENT)$(MAKE) -rf $(CT_NG) V=0 oldconfig @$(ECHO) ' BUILD $(1)' $(SILENT)$(MAKE) -rf $(CT_NG) V=0 build @@ -131,5 +131,5 @@ build-all: $(patsubst %,build-%,$(CT_SAMPLES)) # Build all samples, overiding the number of // jobs per sample build-all.%: - $(SILENT)$(MAKE) -rf $(CT_NG) V=$(V) $(shell echo "$(@)" |sed -r -e 's|^([^.]+)\.([[:digit:]]+)$$|\1 CT_JOBS=\2|;') + $(SILENT)$(MAKE) -rf $(CT_NG) V=$(V) $(shell echo "$(@)" |$(sed) -r -e 's|^([^.]+)\.([[:digit:]]+)$$|\1 CT_JOBS=\2|;') |