[Libreoffice-commits] .: solenv/gbuild solenv/inc

[Matus Kukan]

 solenv/gbuild/templates/makefile.mk |   41 ------------------------------------
 solenv/inc/gbuildbridge.mk          |    4 +--
 2 files changed, 3 insertions(+), 42 deletions(-)

New commits:
commit 323a936e23e27d7691eb115d3d1a696acad94d9a
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Mar 18 12:01:25 2012 +0100

    gbuildbridge: gb_MAKETARGET is empty, gb_PARTIALBUILD defined in partial_build

diff --git a/solenv/gbuild/templates/makefile.mk b/solenv/gbuild/templates/makefile.mk
index d4cf94e..0997622 100644
--- a/solenv/gbuild/templates/makefile.mk
+++ b/solenv/gbuild/templates/makefile.mk
@@ -1,40 +1 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-TARGET=prj
-
-.INCLUDE : settings.mk
-
-.IF "$(VERBOSE)"!=""
-VERBOSEFLAG :=
-.ELSE
-VERBOSEFLAG := -s
-.ENDIF
-
-all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+.INCLUDE : gbuildbridge.mk
diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk
index de43800..b9b1264 100644
--- a/solenv/inc/gbuildbridge.mk
+++ b/solenv/inc/gbuildbridge.mk
@@ -34,8 +34,8 @@ TARGET=prj
 all:
 .ELIF "$(VERBOSE)"!=""
 all:
-	cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T
+	cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM)
 .ELSE
 all:
-	@cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T
+	@cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM)
 .END