[Libreoffice-commits] .: 2 commits - Makefile.in solenv/gbuild

[Tor Lillqvist]

 Makefile.in                        |   15 ++++++---------
 solenv/gbuild/platform/winmingw.mk |   20 ++++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 3350ef088c3b40a899157fd8017e050a7a67ba33
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 22:01:47 2011 +0300

    Use OUTDIR_FOR_BUILD to run build-time tools

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 74fdd2a..0991cd7 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -733,15 +733,15 @@ gb_Library_COMPONENTPREFIXES := \
 
 # UnoApiTarget
 
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
-gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
-gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
-gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
-gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
-gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
 # vim: set noet sw=4:
commit 0dda4aed4cee368b06cc90e269b250abf43b9c88
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 22:00:54 2011 +0300

    Choose build.pl or make automatically in cross-build-toolset

diff --git a/Makefile.in b/Makefile.in
index c52725d..7a1ced2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ cross-build-toolset:
 	  jvmaccess \
 	  bridges \
 	  ucbhelper \
-	  GBUILD:comphelper \
+	  comphelper \
 	  jvmfwk \
 	  regexp \
 	  berkeleydb \
@@ -73,20 +73,17 @@ cross-build-toolset:
 	  dictionaries \
 	  o3tl \
 	  basegfx \
-	  GBUILD:tools \
+	  tools \
 	  idl \
 	  l10ntools \
 	  rsc \
 	  setup_native \
 	  icc; do \
-	    case $$D in \
-	    GBUILD:*) \
-	      (cd $${D#*:} && make -r -j at BUILD_MAX_JOBS@) \
-	      ;; \
-	    *) \
+	    if grep -q gb_Module_add_targets $$D/Module_$$D.mk 2>/dev/null; then \
+	      (cd $$D && make -r -j at BUILD_MAX_JOBS@) \
+	    else \
 	      (cd $$D && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) \
-	      ;; \
-	    esac; \
+	    fi; \
 	done
 endif