detect gmake 3.81 and limit to -j1 unless num-cpu is explicitly set

2011-08-19 18:29:07 -05:00
parent 3c880648fb
commit d64bbd6bf8
67 changed files with 93 additions and 68 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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)
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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" );
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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