summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-06-11 10:29:07 +0000
committerrubidium <rubidium@openttd.org>2007-06-11 10:29:07 +0000
commit68c369ea98c4379c25300d055eb206ff8f4442cb (patch)
tree7663a64bc84d6b2c490b2b0212de709569930a13
parent719395f216deb3a6ffad8cd532321f7b81dc94fb (diff)
downloadopenttd-68c369ea98c4379c25300d055eb206ff8f4442cb.tar.xz
(svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.
-rw-r--r--Makefile.in4
-rw-r--r--config.lib2
2 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 19c4c667f..95c08f1f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,10 +31,14 @@ OS = !!OS!!
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
diff --git a/config.lib b/config.lib
index 252a17f07..99f975e7f 100644
--- a/config.lib
+++ b/config.lib
@@ -531,6 +531,7 @@ check_params() {
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 @@ make_sed() {
s#!!AWK!!#$awk#g;
s#!!GCC295!!#$gcc295#g;
s#!!ENABLE_INSTALL!!#$enable_install#g;
+ s#!!DISTCC!!#$distcc#g;
"
}