cpp/openttd-patchpack/source Changeset - r6851:739b9546adfb

Changeset - r6851:739b9546adfb

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 17 years ago 2007-06-11 10:29:07
rubidium@openttd.org

(svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.

2 files changed with 6 insertions and 0 deletions:

Makefile.in

config.lib

0 comments (0 inline, 0 general)

Makefile.in

➞

Show inline comments

@@ @@ -28,16 +28,20 @@ ENABLE_INSTALL = !!ENABLE_INSTALL!! @@
 TTD = !!TTD!!
 TTDS = $(SRC_DIRS:%=%/$(TTD))
 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
 ifdef LIPO
 # Lipo is an OSX thing. If it is defined, it means we are building for universal,
 # and so we have have to combine the binaries into one big binary

config.lib

➞

Show inline comments

@@ @@ -528,12 +528,13 @@ check_params() { @@
 	else
 		distcc="$with_distcc"
 	fi
 	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"
 				exit 1
 			fi
 			if [ "$with_distcc" != "1" ]; then
@@ @@ -1932,12 +1933,13 @@ make_sed() { @@
 		s#!!OS!!#$os#g;
 		s#!!CONFIGURE_FILES!!#$CONFIGURE_FILES#g;
 		s#!!REVISION!!#$revision#g;
 		s#!!AWK!!#$awk#g;
 		s#!!GCC295!!#$gcc295#g;
 		s#!!ENABLE_INSTALL!!#$enable_install#g;
 		s#!!DISTCC!!#$distcc#g;
+	"
+}
 generate_main() {
 	STAGE="[MAIN]"

0 comments (0 inline, 0 general)