[Libreoffice-commits] .: Makefile.top

Matus Kukan mkukan at kemper.freedesktop.org
Wed May 16 11:04:43 PDT 2012


 Makefile.top |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9aad89df8757d4570084424e63b9562a13448bde
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed May 16 20:00:47 2012 +0200

    improve make invocation
    
    Change-Id: I9dbe77062df3a9b02dab0f5755c0e616829fa125

diff --git a/Makefile.top b/Makefile.top
index 6c473ec..70bfe7a 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -243,7 +243,7 @@ xpdf\
 xsltml\
 zlib\
 
-gb_TAILBUILDMODULES := $(shell make -f $(SRCDIR)/tail_build/Makefile showmodules)
+gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
 export gb_TAILBUILDTARGET=all slowcheck
 
 define gbuild_module_rules
@@ -389,7 +389,7 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
 endif
 	cd packimages && unset MAKEFLAGS && \
 		$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) && \
-		make
+		$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
 
 build: build-packimages
 ifeq ($(OS_FOR_BUILD),WNT)


More information about the Libreoffice-commits mailing list