[Libreoffice-commits] .: Branch 'feature/gnumake2' - 3 commits - starmath/util sw/prj

[Norbert Thiebaud]

 starmath/util/makefile.mk |    3 +--
 sw/prj/gbuild.lst         |    6 +++---
 sw/prj/makefile.mk        |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit b1176c6914ecc8d59f99dbf5e0f191861b22dfb0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jan 10 18:54:55 2011 -0600

    fix gbuild.lst dependency list for sw

diff --git a/sw/prj/gbuild.lst b/sw/prj/gbuild.lst
index 2b316d4..50b86d6 100644
--- a/sw/prj/gbuild.lst
+++ b/sw/prj/gbuild.lst
@@ -1,2 +1,3 @@
-sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL
-sw sw\prj nmake - all sw_prj   NULL
+sw      sw      :    filter offuh l10n connectivity writerperfect lotuswordpro vbahelper svx stoc writerfilter NULL
+sw	sw\prj									nmake		-	all	sw_prj NULL
+
commit ad5212a000230846c4e85125739d5fb0f0862c77
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jan 10 01:27:50 2011 -0600

    fix srs dependencies

diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
index 1ba5241..2fe7da5 100644
--- a/starmath/util/makefile.mk
+++ b/starmath/util/makefile.mk
@@ -42,8 +42,7 @@ GEN_HID_OTHER=TRUE
 RESLIB1NAME=sm
 RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES=\
-    $(SRS)$/smres.srs \
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+    $(SRS)$/smres.srs
 
 SHL1TARGET= sm$(DLLPOSTFIX)
 SHL1IMPLIB= smimp
commit d9cdcd15664adab9786ba3b9d151aa7ad21d7592
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jan 10 01:10:36 2011 -0600

    support build.pl with gmake

diff --git a/sw/prj/gbuild.lst b/sw/prj/gbuild.lst
index d4770ee..2b316d4 100644
--- a/sw/prj/gbuild.lst
+++ b/sw/prj/gbuild.lst
@@ -1,3 +1,2 @@
 sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL
-sw sw     usr1  - all sw_mkout NULL
 sw sw\prj nmake - all sw_prj   NULL
diff --git a/sw/prj/makefile.mk b/sw/prj/makefile.mk
index ab983d2..c677d2b 100644
--- a/sw/prj/makefile.mk
+++ b/sw/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)