Author: jani Date: Sun Oct 20 18:29:21 2013 New Revision: 1533941 URL: http://svn.apache.org/r1533941 Log: changed Makefile to Makefile.gb to have a place for new Makefile this called for a change in prj/makefile.mk
Added: openoffice/branches/capstone2013/main/GNUmakefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/GNUmakefile openoffice/branches/capstone2013/main/comphelper/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/comphelper/Makefile openoffice/branches/capstone2013/main/drawinglayer/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/drawinglayer/Makefile openoffice/branches/capstone2013/main/editeng/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/editeng/Makefile openoffice/branches/capstone2013/main/framework/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/framework/Makefile openoffice/branches/capstone2013/main/padmin/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/padmin/Makefile openoffice/branches/capstone2013/main/sfx2/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/sfx2/Makefile openoffice/branches/capstone2013/main/sot/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/sot/Makefile openoffice/branches/capstone2013/main/svgio/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/svgio/Makefile openoffice/branches/capstone2013/main/svl/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/svl/Makefile openoffice/branches/capstone2013/main/svtools/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/svtools/Makefile openoffice/branches/capstone2013/main/svx/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/svx/Makefile openoffice/branches/capstone2013/main/sw/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/sw/Makefile openoffice/branches/capstone2013/main/toolkit/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/toolkit/Makefile openoffice/branches/capstone2013/main/tools/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/tools/Makefile openoffice/branches/capstone2013/main/unoxml/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/unoxml/Makefile openoffice/branches/capstone2013/main/vbahelper/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/vbahelper/Makefile openoffice/branches/capstone2013/main/vcl/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/vcl/Makefile openoffice/branches/capstone2013/main/xmloff/Makefile.gb - copied unchanged from r1531526, openoffice/branches/capstone2013/main/xmloff/Makefile Removed: openoffice/branches/capstone2013/main/GNUmakefile openoffice/branches/capstone2013/main/comphelper/Makefile openoffice/branches/capstone2013/main/drawinglayer/Makefile openoffice/branches/capstone2013/main/editeng/Makefile openoffice/branches/capstone2013/main/framework/Makefile openoffice/branches/capstone2013/main/padmin/Makefile openoffice/branches/capstone2013/main/sfx2/Makefile openoffice/branches/capstone2013/main/sot/Makefile openoffice/branches/capstone2013/main/svgio/Makefile openoffice/branches/capstone2013/main/svl/Makefile openoffice/branches/capstone2013/main/svtools/Makefile openoffice/branches/capstone2013/main/svx/Makefile openoffice/branches/capstone2013/main/sw/Makefile openoffice/branches/capstone2013/main/toolkit/Makefile openoffice/branches/capstone2013/main/tools/Makefile openoffice/branches/capstone2013/main/unoxml/Makefile openoffice/branches/capstone2013/main/vbahelper/Makefile openoffice/branches/capstone2013/main/vcl/Makefile openoffice/branches/capstone2013/main/xmloff/Makefile Modified: openoffice/branches/capstone2013/main/Makefile openoffice/branches/capstone2013/main/comphelper/prj/makefile.mk openoffice/branches/capstone2013/main/drawinglayer/prj/makefile.mk openoffice/branches/capstone2013/main/editeng/prj/makefile.mk openoffice/branches/capstone2013/main/framework/prj/makefile.mk openoffice/branches/capstone2013/main/padmin/prj/makefile.mk openoffice/branches/capstone2013/main/sfx2/prj/makefile.mk openoffice/branches/capstone2013/main/sot/prj/makefile.mk openoffice/branches/capstone2013/main/svgio/prj/makefile.mk openoffice/branches/capstone2013/main/svl/prj/makefile.mk openoffice/branches/capstone2013/main/svtools/prj/makefile.mk openoffice/branches/capstone2013/main/svx/prj/makefile.mk openoffice/branches/capstone2013/main/sw/prj/makefile.mk openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk openoffice/branches/capstone2013/main/tools/prj/makefile.mk openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk openoffice/branches/capstone2013/main/vcl/prj/makefile.mk openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk Modified: openoffice/branches/capstone2013/main/Makefile URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/Makefile?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/Makefile (original) +++ openoffice/branches/capstone2013/main/Makefile Sun Oct 20 18:29:21 2013 @@ -22,17 +22,18 @@ # ========== target function modifiers ========== # target modification, to allow "make prepare" instead of "make prepare all" -MODULE_TARGET := $(filter-out prepare clean genPO, $(MAKECMDGOALS)) +EXECUTE_TARGET := prepare clean rebuild genPO +MODULE_TARGET := $(filter-out $(EXECUTE_TARGET), $(MAKECMDGOALS)) ifeq ($(MODULE_TARGET),) MODULE_TARGET := all endif -SUB_TARGET := $(filter prepare clean genPO, $(MAKECMDGOALS)) +SUB_TARGET := $(filter $(EXECUTE_TARGET), $(MAKECMDGOALS)) -MAKE_CALL= @echo $@ $(SUB_TARGET) +MAKE_CALL= @cd $@; Make $(SUB_TARGET) all: instsetoo_native -prepare clean genPO: $(MODULE_TARGET) +$(EXECUTE_TARGET) : $(MODULE_TARGET) Modified: openoffice/branches/capstone2013/main/comphelper/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/comphelper/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/comphelper/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/comphelper/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/drawinglayer/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/drawinglayer/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/drawinglayer/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/drawinglayer/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/editeng/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/editeng/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/editeng/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/framework/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/framework/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/framework/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/framework/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/padmin/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/padmin/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/padmin/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/padmin/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -41,4 +41,4 @@ DEBUG_ARGUMENT= .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) + cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) Modified: openoffice/branches/capstone2013/main/sfx2/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sfx2/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/sfx2/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/sfx2/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/sot/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sot/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/sot/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/sot/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/svgio/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svgio/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/svgio/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/svgio/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/svl/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svl/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/svl/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/svl/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/svtools/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svtools/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/svtools/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/svtools/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/svx/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/svx/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/svx/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/svx/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/sw/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sw/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/sw/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/sw/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/toolkit/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/tools/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/tools/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/tools/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/tools/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/unoxml/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -41,4 +41,4 @@ DEBUG_ARGUMENT= .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) + cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) Modified: openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/vbahelper/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog Modified: openoffice/branches/capstone2013/main/vcl/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/vcl/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/vcl/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/vcl/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -41,4 +41,4 @@ DEBUG_ARGUMENT= .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) + cd $(PRJ) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) Modified: openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk?rev=1533941&r1=1533940&r2=1533941&view=diff ============================================================================== --- openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk (original) +++ openoffice/branches/capstone2013/main/xmloff/prj/makefile.mk Sun Oct 20 18:29:21 2013 @@ -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) -f Makefile.gb $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) -f Makefile.gb $(VERBOSEFLAG) -r deliverlog