You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/04 10:57:52 UTC
svn commit: r1772520 - in /openoffice/trunk/main: basebmp/prj/ basegfx/prj/
canvas/prj/ cppcanvas/prj/ dbaccess/prj/ idl/prj/ linguistic/prj/
offapi/prj/ oovbaapi/prj/ oox/prj/ padmin/prj/ reportdesign/prj/ sax/prj/
sd/prj/ solenv/gbuild/templates/ sta...
Author: damjan
Date: Sun Dec 4 10:57:52 2016
New Revision: 1772520
URL: http://svn.apache.org/viewvc?rev=1772520&view=rev
Log:
Standardize all gbuild bridge makefile.mk files
(main/*/prj/makefile.mk) to the version that sets gbuild
debug flags from the configure.ac debug settings, and make this the
standard gbuild template too.
Patch by: me
Modified:
openoffice/trunk/main/basebmp/prj/makefile.mk
openoffice/trunk/main/basegfx/prj/makefile.mk
openoffice/trunk/main/canvas/prj/makefile.mk
openoffice/trunk/main/cppcanvas/prj/makefile.mk
openoffice/trunk/main/dbaccess/prj/makefile.mk
openoffice/trunk/main/idl/prj/makefile.mk
openoffice/trunk/main/linguistic/prj/makefile.mk
openoffice/trunk/main/offapi/prj/makefile.mk
openoffice/trunk/main/oovbaapi/prj/makefile.mk
openoffice/trunk/main/oox/prj/makefile.mk
openoffice/trunk/main/padmin/prj/makefile.mk
openoffice/trunk/main/reportdesign/prj/makefile.mk
openoffice/trunk/main/sax/prj/makefile.mk
openoffice/trunk/main/sd/prj/makefile.mk
openoffice/trunk/main/solenv/gbuild/templates/makefile.mk
openoffice/trunk/main/starmath/prj/makefile.mk
openoffice/trunk/main/svgio/prj/makefile.mk
openoffice/trunk/main/ucbhelper/prj/makefile.mk
openoffice/trunk/main/udkapi/prj/makefile.mk
openoffice/trunk/main/unotools/prj/makefile.mk
openoffice/trunk/main/unoxml/prj/makefile.mk
openoffice/trunk/main/vcl/prj/makefile.mk
openoffice/trunk/main/wizards/prj/makefile.mk
openoffice/trunk/main/writerfilter/prj/makefile.mk
openoffice/trunk/main/xmlreader/prj/makefile.mk
openoffice/trunk/main/xmlscript/prj/makefile.mk
Modified: openoffice/trunk/main/basebmp/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/basebmp/prj/makefile.mk (original)
+++ openoffice/trunk/main/basebmp/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/basegfx/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/basegfx/prj/makefile.mk (original)
+++ openoffice/trunk/main/basegfx/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/canvas/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/canvas/prj/makefile.mk (original)
+++ openoffice/trunk/main/canvas/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/cppcanvas/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppcanvas/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/cppcanvas/prj/makefile.mk (original)
+++ openoffice/trunk/main/cppcanvas/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/dbaccess/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/prj/makefile.mk (original)
+++ openoffice/trunk/main/dbaccess/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/idl/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/idl/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/idl/prj/makefile.mk (original)
+++ openoffice/trunk/main/idl/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/linguistic/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/linguistic/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/linguistic/prj/makefile.mk (original)
+++ openoffice/trunk/main/linguistic/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/offapi/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/prj/makefile.mk (original)
+++ openoffice/trunk/main/offapi/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/oovbaapi/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oovbaapi/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/oovbaapi/prj/makefile.mk (original)
+++ openoffice/trunk/main/oovbaapi/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/oox/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oox/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/oox/prj/makefile.mk (original)
+++ openoffice/trunk/main/oox/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/padmin/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/padmin/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/padmin/prj/makefile.mk (original)
+++ openoffice/trunk/main/padmin/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/reportdesign/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/prj/makefile.mk (original)
+++ openoffice/trunk/main/reportdesign/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/sax/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sax/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/sax/prj/makefile.mk (original)
+++ openoffice/trunk/main/sax/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/sd/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/sd/prj/makefile.mk (original)
+++ openoffice/trunk/main/sd/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/solenv/gbuild/templates/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/templates/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/templates/makefile.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/templates/makefile.mk Sun Dec 4 10:57:52 2016
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/starmath/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/prj/makefile.mk (original)
+++ openoffice/trunk/main/starmath/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/svgio/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/svgio/prj/makefile.mk (original)
+++ openoffice/trunk/main/svgio/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/ucbhelper/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ucbhelper/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/ucbhelper/prj/makefile.mk (original)
+++ openoffice/trunk/main/ucbhelper/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/udkapi/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udkapi/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/udkapi/prj/makefile.mk (original)
+++ openoffice/trunk/main/udkapi/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/unotools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/prj/makefile.mk (original)
+++ openoffice/trunk/main/unotools/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/unoxml/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unoxml/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/unoxml/prj/makefile.mk (original)
+++ openoffice/trunk/main/unoxml/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/vcl/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/prj/makefile.mk (original)
+++ openoffice/trunk/main/vcl/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -41,4 +41,4 @@ DEBUG_ARGUMENT=
.ENDIF
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/wizards/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/prj/makefile.mk (original)
+++ openoffice/trunk/main/wizards/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/writerfilter/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/writerfilter/prj/makefile.mk (original)
+++ openoffice/trunk/main/writerfilter/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/xmlreader/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmlreader/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/xmlreader/prj/makefile.mk (original)
+++ openoffice/trunk/main/xmlreader/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/xmlscript/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmlscript/prj/makefile.mk?rev=1772520&r1=1772519&r2=1772520&view=diff
==============================================================================
--- openoffice/trunk/main/xmlscript/prj/makefile.mk (original)
+++ openoffice/trunk/main/xmlscript/prj/makefile.mk Sun Dec 4 10:57:52 2016
@@ -1,4 +1,4 @@
-###############################################################
+#**************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
-###############################################################
+#**************************************************************
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog