From 559db5c2b1cc58087b93954a0162960ffecd577a Mon Sep 17 00:00:00 2001 From: Damjan Jovanovic Date: Sun, 4 Dec 2016 10:57:52 +0000 Subject: 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 --- unotools/prj/makefile.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'unotools') diff --git a/unotools/prj/makefile.mk b/unotools/prj/makefile.mk index 19eb7c11eb7f..c62c6a657d16 100644 --- a/unotools/prj/makefile.mk +++ b/unotools/prj/makefile.mk @@ -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 -- cgit