[Libreoffice-commits] .: Makefile.in

Tor Lillqvist tml at kemper.freedesktop.org
Sun Jun 12 06:00:37 PDT 2011


 Makefile.in |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit f2938c4c751504dfa503b78a517cb1fee3cb4e3a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 12 16:00:11 2011 +0300

    Add sax and stoc, use merged list in cross-build-toolset

diff --git a/Makefile.in b/Makefile.in
index 0d70a9f..1abdfd8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,20 +63,25 @@ cross-build-toolset:
 	  comphelper \
 	  jvmfwk \
 	  regexp \
+	  sax \
+	  stoc \
 	  i18npool \
 	  unodevtools \
 	  gettext \
 	  dictionaries \
 	  o3tl \
 	  basegfx \
-	  tools \
+	  GBUILD:comphelper \
+	  GBUILD:tools \
 	  rsc; do \
-	    (cd $$D && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl); \
-	done; \
-	for D in \
-	  comphelper \
-	  tools; do \
-	    (cd $$D && make -r -j at BUILD_MAX_JOBS@); \
+	    case $$D in \
+	    GBUILD:*) \
+	      (cd $${D#*:} && make -r -j at BUILD_MAX_JOBS@) \
+	      ;; \
+	    *) \
+	      (cd $$D && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) \
+	      ;; \
+	    esac; \
 	done
 endif
 


More information about the Libreoffice-commits mailing list