Mercurial > hg > openttd
changeset 6851:c0bf39a8dc40 draft
(svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Mon, 11 Jun 2007 10:29:07 +0000 |
parents | 500f7e6d4ec9 |
children | 31184effcea5 |
files | Makefile.in config.lib |
diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in +++ b/Makefile.in @@ -31,10 +31,14 @@ OSXAPP = !!OSXAPP!! REVISION = !!REVISION!! AWK = !!AWK!! +DISTCC = !!DISTCC!! RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi ) all: config.cache +ifdef DISTCC + @if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi +endif @for dir in $(DIRS); do \ $(MAKE) -C $$dir all; \ done
--- a/config.lib +++ b/config.lib @@ -531,6 +531,7 @@ if [ "$with_distcc" != "0" ]; then res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 0-6`" if [ "$res" != "distcc" ]; then + distcc="" log 1 "checking distcc... no" if [ "$with_distcc" = "2" ]; then log 1 "configure: error: no distcc detected, but was forced to be used" @@ -1935,6 +1936,7 @@ s#!!AWK!!#$awk#g; s#!!GCC295!!#$gcc295#g; s#!!ENABLE_INSTALL!!#$enable_install#g; + s#!!DISTCC!!#$distcc#g; " }