From d64bbd6bf8d41604e3f14f911f2169f4295e4d99 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 19 Aug 2011 18:29:07 -0500 Subject: detect gmake 3.81 and limit to -j1 unless num-cpu is explicitly set --- animations/prj/makefile.mk | 2 +- basctl/prj/makefile.mk | 2 +- basebmp/prj/makefile.mk | 2 +- basegfx/prj/makefile.mk | 2 +- basic/prj/makefile.mk | 2 +- canvas/prj/makefile.mk | 2 +- chart2/prj/makefile.mk | 2 +- comphelper/prj/makefile.mk | 2 +- configure.in | 30 +++++++++++++++++++++++++++--- cppcanvas/prj/makefile.mk | 2 +- cui/prj/makefile.mk | 2 +- dbaccess/prj/makefile.mk | 2 +- drawinglayer/prj/makefile.mk | 2 +- dtrans/prj/makefile.mk | 2 +- editeng/prj/makefile.mk | 2 +- fileaccess/prj/makefile.mk | 2 +- forms/prj/makefile.mk | 2 +- formula/prj/makefile.mk | 2 +- framework/prj/makefile.mk | 2 +- hwpfilter/prj/makefile.mk | 2 +- i18npool/prj/makefile.mk | 2 +- i18nutil/prj/makefile.mk | 2 +- idl/prj/makefile.mk | 2 +- linguistic/prj/makefile.mk | 2 +- lotuswordpro/prj/makefile.mk | 2 +- o3tl/prj/makefile.mk | 2 +- offapi/prj/makefile.mk | 2 +- officecfg/prj/makefile.mk | 2 +- oovbaapi/prj/makefile.mk | 2 +- oovbaapi/ttt.diff | 2 +- oox/prj/makefile.mk | 2 +- padmin/prj/makefile.mk | 2 +- psprint_config/prj/makefile.mk | 2 +- regexp/prj/makefile.mk | 2 +- reportdesign/prj/makefile.mk | 2 +- rsc/prj/makefile.mk | 2 +- sax/prj/makefile.mk | 2 +- sc/prj/makefile.mk | 2 +- scaddins/prj/makefile.mk | 2 +- sccomp/prj/makefile.mk | 2 +- sd/prj/makefile.mk | 2 +- set_soenv.in | 1 + sfx2/prj/makefile.mk | 2 +- slideshow/prj/makefile.mk | 2 +- solenv/gbuild/templates/makefile.mk | 2 +- sot/prj/makefile.mk | 2 +- starmath/prj/makefile.mk | 2 +- svl/prj/makefile.mk | 2 +- svtools/prj/makefile.mk | 2 +- svx/prj/makefile.mk | 2 +- sw/prj/makefile.mk | 2 +- toolkit/prj/makefile.mk | 2 +- tools/prj/makefile.mk | 2 +- ucbhelper/prj/makefile.mk | 2 +- udkapi/prj/makefile.mk | 2 +- unotools/prj/makefile.mk | 2 +- unoxml/prj/makefile.mk | 2 +- uui/prj/makefile.mk | 2 +- vbahelper/prj/makefile.mk | 2 +- vcl/prj/makefile.mk | 2 +- wizards/prj/makefile.mk | 2 +- writerfilter/prj/makefile.mk | 2 +- writerperfect/prj/makefile.mk | 2 +- xmloff/prj/makefile.mk | 2 +- xmlreader/prj/makefile.mk | 2 +- xmlscript/prj/makefile.mk | 2 +- xmlsecurity/prj/makefile.mk | 2 +- 67 files changed, 93 insertions(+), 68 deletions(-) diff --git a/animations/prj/makefile.mk b/animations/prj/makefile.mk index bcb4970389b5..95b2a0f2f1e5 100755 --- a/animations/prj/makefile.mk +++ b/animations/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basctl/prj/makefile.mk b/basctl/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/basctl/prj/makefile.mk +++ b/basctl/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basebmp/prj/makefile.mk b/basebmp/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/basebmp/prj/makefile.mk +++ b/basebmp/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basegfx/prj/makefile.mk b/basegfx/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/basegfx/prj/makefile.mk +++ b/basegfx/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basic/prj/makefile.mk b/basic/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/basic/prj/makefile.mk +++ b/basic/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/canvas/prj/makefile.mk b/canvas/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/canvas/prj/makefile.mk +++ b/canvas/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/chart2/prj/makefile.mk b/chart2/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/chart2/prj/makefile.mk +++ b/chart2/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/comphelper/prj/makefile.mk b/comphelper/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/comphelper/prj/makefile.mk +++ b/comphelper/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/configure.in b/configure.in index cbd835c7e2eb..536ca8ba5e27 100755 --- a/configure.in +++ b/configure.in @@ -2443,8 +2443,12 @@ fi AC_MSG_CHECKING([the GNU make version]) _make_version=`$GNUMAKE --version | grep GNU | grep -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` -if test "$_make_longver" -ge "038100" ; then +if test "$_make_longver" -ge "038200" ; then AC_MSG_RESULT([$GNUMAKE $_make_version]) + +elif test "$_make_longver" -ge "038100" ; then + AC_MSG_RESULT([$GNUMAKE $_make_version]) + no_parallelism_make="YES" else AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed]) fi @@ -9080,7 +9084,7 @@ AC_MSG_RESULT([$BUILD_MAX_JOBS]) AC_SUBST(BUILD_MAX_JOBS) # ===================================================================== -# determine the parallelism for tail_build +# determine the parallelism for gnu make # ===================================================================== AC_MSG_CHECKING([for maximum parallelism for gmake]) if test $BUILD_MAX_JOBS -gt $BUILD_NCPUS ; then @@ -9088,8 +9092,28 @@ if test $BUILD_MAX_JOBS -gt $BUILD_NCPUS ; then else GMAKE_PARALLELISM="$BUILD_NCPUS" fi -AC_MSG_RESULT([$GMAKE_PARALLELISM]) +GMAKE_MODULE_PARALLELISM="$BUILD_NCPUS" +if test "$no_parallelism_make" = "YES" ; then + if test -z "$with_num_cpus"; then + GMAKE_PARALLELISM="1"; + if test $GMAKE_MODULE_PARALLELISM -gt 1 ; then + AC_MSG_WARN([gmake 3.81 crashes with parallelism > 1, reducing it to 1. upgrade to 3.82 to avoid this.]) + if test -z "$with_num_cpus"; then + echo "gmake 3.81 crashes with parallelism > 1, reducing it to 1. upgrade to 3.82 to avoid this." >> warn + fi + GMAKE_MODULE_PARALLELISM="1" + fi + else + GMAKE_PARALLELISM="$BUILD_NCPUS"; + echo "make 3.81 is prone to crashes with parallelism > 1. Since --with-num-cpu was explicitely given, it is honored, but do not complain when make segfault on you." >> warn + fi +fi + +# GMAKE_PARALLELISM is used in tail_build +# GMAKE_MODULE_PARALLELISM is used when building individual gbuildified module +AC_MSG_RESULT([per module:$GMAKE_MODULE_PARALLELISM, for tail_build:$GMAKE_PARALLELISM]) AC_SUBST(GMAKE_PARALLELISM) +AC_SUBST(GMAKE_MODULE_PARALLELISM) dnl =================================================================== dnl Setting up the environment. diff --git a/cppcanvas/prj/makefile.mk b/cppcanvas/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/cppcanvas/prj/makefile.mk +++ b/cppcanvas/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/cui/prj/makefile.mk b/cui/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/cui/prj/makefile.mk +++ b/cui/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/dbaccess/prj/makefile.mk b/dbaccess/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/dbaccess/prj/makefile.mk +++ b/dbaccess/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/drawinglayer/prj/makefile.mk b/drawinglayer/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/drawinglayer/prj/makefile.mk +++ b/drawinglayer/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/dtrans/prj/makefile.mk b/dtrans/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/dtrans/prj/makefile.mk +++ b/dtrans/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/editeng/prj/makefile.mk b/editeng/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/editeng/prj/makefile.mk +++ b/editeng/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/fileaccess/prj/makefile.mk b/fileaccess/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/fileaccess/prj/makefile.mk +++ b/fileaccess/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/forms/prj/makefile.mk b/forms/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/forms/prj/makefile.mk +++ b/forms/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/formula/prj/makefile.mk b/formula/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/formula/prj/makefile.mk +++ b/formula/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/framework/prj/makefile.mk +++ b/framework/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/hwpfilter/prj/makefile.mk b/hwpfilter/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/hwpfilter/prj/makefile.mk +++ b/hwpfilter/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/i18npool/prj/makefile.mk b/i18npool/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/i18npool/prj/makefile.mk +++ b/i18npool/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/i18nutil/prj/makefile.mk b/i18nutil/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/i18nutil/prj/makefile.mk +++ b/i18nutil/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/idl/prj/makefile.mk b/idl/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100755 --- a/idl/prj/makefile.mk +++ b/idl/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/linguistic/prj/makefile.mk b/linguistic/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100755 --- a/linguistic/prj/makefile.mk +++ b/linguistic/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/lotuswordpro/prj/makefile.mk b/lotuswordpro/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/lotuswordpro/prj/makefile.mk +++ b/lotuswordpro/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/o3tl/prj/makefile.mk b/o3tl/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/o3tl/prj/makefile.mk +++ b/o3tl/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/offapi/prj/makefile.mk b/offapi/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/offapi/prj/makefile.mk +++ b/offapi/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/officecfg/prj/makefile.mk b/officecfg/prj/makefile.mk index d30a7dd4f0a4..672133420344 100644 --- a/officecfg/prj/makefile.mk +++ b/officecfg/prj/makefile.mk @@ -29,4 +29,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/oovbaapi/prj/makefile.mk b/oovbaapi/prj/makefile.mk index c677d2b3ec3f..b7863992eb89 100644 --- a/oovbaapi/prj/makefile.mk +++ b/oovbaapi/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) diff --git a/oovbaapi/ttt.diff b/oovbaapi/ttt.diff index 2400d2cf9421..4af8d1f176ff 100644 --- a/oovbaapi/ttt.diff +++ b/oovbaapi/ttt.diff @@ -407,4 +407,4 @@ new file mode 100644 +.ENDIF + +all: -+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) ++ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) diff --git a/oox/prj/makefile.mk b/oox/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/oox/prj/makefile.mk +++ b/oox/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/padmin/prj/makefile.mk b/padmin/prj/makefile.mk index c73a3d944bbf..4c54958c1947 100644 --- a/padmin/prj/makefile.mk +++ b/padmin/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) diff --git a/psprint_config/prj/makefile.mk b/psprint_config/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/psprint_config/prj/makefile.mk +++ b/psprint_config/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/regexp/prj/makefile.mk b/regexp/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/regexp/prj/makefile.mk +++ b/regexp/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/reportdesign/prj/makefile.mk b/reportdesign/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/reportdesign/prj/makefile.mk +++ b/reportdesign/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/rsc/prj/makefile.mk b/rsc/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/rsc/prj/makefile.mk +++ b/rsc/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sax/prj/makefile.mk b/sax/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/sax/prj/makefile.mk +++ b/sax/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sc/prj/makefile.mk b/sc/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/sc/prj/makefile.mk +++ b/sc/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/scaddins/prj/makefile.mk b/scaddins/prj/makefile.mk index bcb4970389b5..95b2a0f2f1e5 100644 --- a/scaddins/prj/makefile.mk +++ b/scaddins/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sccomp/prj/makefile.mk b/sccomp/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/sccomp/prj/makefile.mk +++ b/sccomp/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sd/prj/makefile.mk b/sd/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/sd/prj/makefile.mk +++ b/sd/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/set_soenv.in b/set_soenv.in index 7e4441f8c4b4..76681f3542b1 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1815,6 +1815,7 @@ else ToFile( "WORKDIR_FOR_BUILD", $WORKDIR, "e" ); } ToFile( "GMAKE_PARALLELISM", "@GMAKE_PARALLELISM@", "e" ); +ToFile( "GMAKE_MODULE_PARALLELISM","@GMAKE_MODULE_PARALLELISM@", "e" ); ToFile( "SIZEOF_SHORT", "@SIZEOF_SHORT@", "e" ); ToFile( "SIZEOF_INT", "@SIZEOF_INT@", "e" ); ToFile( "SIZEOF_LONG", "@SIZEOF_LONG@", "e" ); diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/slideshow/prj/makefile.mk b/slideshow/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/slideshow/prj/makefile.mk +++ b/slideshow/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/solenv/gbuild/templates/makefile.mk b/solenv/gbuild/templates/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/solenv/gbuild/templates/makefile.mk +++ b/solenv/gbuild/templates/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sot/prj/makefile.mk b/sot/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/sot/prj/makefile.mk +++ b/sot/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/starmath/prj/makefile.mk b/starmath/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/starmath/prj/makefile.mk +++ b/starmath/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/svl/prj/makefile.mk +++ b/svl/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/svx/prj/makefile.mk b/svx/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/svx/prj/makefile.mk +++ b/svx/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/sw/prj/makefile.mk +++ b/sw/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/toolkit/prj/makefile.mk +++ b/toolkit/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/ucbhelper/prj/makefile.mk b/ucbhelper/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/ucbhelper/prj/makefile.mk +++ b/ucbhelper/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/udkapi/prj/makefile.mk b/udkapi/prj/makefile.mk index c677d2b3ec3f..b7863992eb89 100644 --- a/udkapi/prj/makefile.mk +++ b/udkapi/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) diff --git a/unotools/prj/makefile.mk b/unotools/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/unotools/prj/makefile.mk +++ b/unotools/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/unoxml/prj/makefile.mk b/unoxml/prj/makefile.mk index 5ebed8a45c4a..6d474ca27aee 100644 --- a/unoxml/prj/makefile.mk +++ b/unoxml/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) diff --git a/uui/prj/makefile.mk b/uui/prj/makefile.mk index bcb4970389b5..95b2a0f2f1e5 100644 --- a/uui/prj/makefile.mk +++ b/uui/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/vbahelper/prj/makefile.mk b/vbahelper/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/vbahelper/prj/makefile.mk +++ b/vbahelper/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/vcl/prj/makefile.mk b/vcl/prj/makefile.mk index c73a3d944bbf..4c54958c1947 100644 --- a/vcl/prj/makefile.mk +++ b/vcl/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) diff --git a/wizards/prj/makefile.mk b/wizards/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/wizards/prj/makefile.mk +++ b/wizards/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/writerfilter/prj/makefile.mk b/writerfilter/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/writerfilter/prj/makefile.mk +++ b/writerfilter/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/writerperfect/prj/makefile.mk b/writerperfect/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/writerperfect/prj/makefile.mk +++ b/writerperfect/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk index e312a7ccab65..ffd9fb276d8a 100755 --- a/xmloff/prj/makefile.mk +++ b/xmloff/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/xmlreader/prj/makefile.mk b/xmlreader/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100644 --- a/xmlreader/prj/makefile.mk +++ b/xmlreader/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/xmlscript/prj/makefile.mk b/xmlscript/prj/makefile.mk index 88cd9dfe08b8..d4cf94ec9f4e 100755 --- a/xmlscript/prj/makefile.mk +++ b/xmlscript/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/xmlsecurity/prj/makefile.mk b/xmlsecurity/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/xmlsecurity/prj/makefile.mk +++ b/xmlsecurity/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit