[Libreoffice-commits] .: Makefile.in

[Miklos Vajna]

 Makefile.in |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 91cdd85737cf3e3fab3010d26bb05fdd526fb35a
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sat Sep 3 20:54:15 2011 -0400

    remove build.pl --gmake option refrences from Makefile
    
    The --gmake option was removed from build.pl in commit 4103138
    This patch removes the remaining references from Makefile.

diff --git a/Makefile.in b/Makefile.in
index 8c7f803..154611a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,12 +2,6 @@
 
 SHELL=/usr/bin/env bash
 
-ifeq ($(USE_GMAKE),)
-GBUILD_OPT:=
-else
-GBUILD_OPT:=--gmake
-endif
-
 ifeq (@CROSS_COMPILING@,YES)
 CROSS_TOOLSET_RULE:=cross-build-toolset
 else
@@ -17,12 +11,12 @@ endif
 all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE)
 	@. ./Env.Host.sh && \
         cd instsetoo_native && \
-        build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
+        build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
 
 cross-build-toolset:
 	@. ./Env.Build.sh && \
 	cd cross_toolset && \
-	build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
+	build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
 
 install:
 	@. ./Env.Host.sh && \
@@ -43,7 +37,7 @@ dev-install:
 	@. ./Env.Host.sh && \
 	cd smoketestoo_native && \
 		export SAL_USE_VCLPLUGIN="svp" && \
-		build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all:instsetoo_native -- -P at BUILD_MAX_JOBS@ && \
+		build.pl -P at BUILD_NCPUS@ --all:instsetoo_native -- -P at BUILD_MAX_JOBS@ && \
 		cd @abs_builddir@ && ln -s $$SOLARVER/$$INPATH/installation/opt/ install && \
 		echo "" && \
 	$$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT && \
@@ -101,7 +95,7 @@ check: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ fetch
 	@. ./Env.Host.sh && \
 	cd smoketestoo_native && \
 	export SAL_USE_VCLPLUGIN="svp" && \
-        build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
+        build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
 	@. ./Env.Host.sh && $$SOLARENV/bin/subsequenttests
 
 id:
@@ -125,7 +119,7 @@ findunusedcode:
 	   source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
 	   . ./solenv/bin/callcatchEnv.Set.sh && \
 	   cd instsetoo_native && \
-	   build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
+	   build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
 	@. ./Env.Host.sh && \
 	   source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
 	   callanalyse \