[Libreoffice-commits] .: Branch 'feature/gnumake2' - 2 commits - svl/prj svtools/Library_svt.mk svtools/prj toolkit/prj tools/prj

[Norbert Thiebaud]

 svl/prj/gbuild.lst      |    6 +++---
 svl/prj/makefile.mk     |    2 +-
 svtools/Library_svt.mk  |    1 +
 svtools/prj/gbuild.lst  |    3 +--
 svtools/prj/makefile.mk |    2 +-
 toolkit/prj/gbuild.lst  |    5 ++---
 toolkit/prj/makefile.mk |    2 +-
 tools/prj/gbuild.lst    |    6 +++---
 tools/prj/makefile.mk   |    2 +-
 9 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit 435fe24e20d8c81a352cb3677b6f61f879abbf20
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jan 10 01:27:31 2011 -0600

    missing object in the gbuild of svt

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 68eaf9c..93d3843 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -149,6 +149,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 	svtools/source/misc/ehdl \
 	svtools/source/misc/embedtransfer \
 	svtools/source/misc/embedhlp \
+	svtools/source/misc/bindablecontrolhelper \
 	svtools/source/misc/cliplistener \
 	svtools/source/misc/transfer \
 	svtools/source/misc/stringtransfer \
commit 17cc5bfa1eaf8e24253b8ec98815937f70728f7d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jan 10 01:09:10 2011 -0600

    support build.pl with gmake

diff --git a/svl/prj/gbuild.lst b/svl/prj/gbuild.lst
index dc1b23e..bbb6d2a 100644
--- a/svl/prj/gbuild.lst
+++ b/svl/prj/gbuild.lst
@@ -1,5 +1,5 @@
-sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL
-sl	svl								usr1	-	all	svl_mkout NULL
-sl	svl\prj	nmake	-	all	svl_prj NULL
+sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot libxslt NULL
+sl	svl\prj							nmake	-	all	svl_prj NULL
+
 
 
diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
index ab983d2..c677d2b 100644
--- a/svl/prj/makefile.mk
+++ b/svl/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)
diff --git a/svtools/prj/gbuild.lst b/svtools/prj/gbuild.lst
index 1754285..43f706d 100644
--- a/svtools/prj/gbuild.lst
+++ b/svtools/prj/gbuild.lst
@@ -1,4 +1,3 @@
 st	svtools	:	l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL
-st	svtools								usr1	-	all	st_mkout NULL
-st	svtools\prj					        nmake	-	all	st_prj NULL
+st	svtools\prj							nmake	-	all	st_prj NULL
 
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
index ab983d2..c677d2b 100644
--- a/svtools/prj/makefile.mk
+++ b/svtools/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)
diff --git a/toolkit/prj/gbuild.lst b/toolkit/prj/gbuild.lst
index b9403f4..4728cf7 100644
--- a/toolkit/prj/gbuild.lst
+++ b/toolkit/prj/gbuild.lst
@@ -1,3 +1,2 @@
-ti toolkit : vcl NULL
-ti toolkit     usr1  - all ti_mkout NULL
-ti toolkit\prj nmake - all ti_prj NULL
+ti	toolkit	:	vcl NULL
+ti	toolkit\prj								nmake	-	all	ti_prj NULL
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
index ab983d2..c677d2b 100644
--- a/toolkit/prj/makefile.mk
+++ b/toolkit/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)
diff --git a/tools/prj/gbuild.lst b/tools/prj/gbuild.lst
index 3194cbb..4a2176f 100644
--- a/tools/prj/gbuild.lst
+++ b/tools/prj/gbuild.lst
@@ -1,3 +1,3 @@
-tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
-tl tools     usr1  - all tl_mkout NULL
-tl tools\prj nmake - all tl_prj NULL
+tl	tools	:	cppu external offuh ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
+tl	tools\prj							nmake	-	all	tl_prj NULL
+
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
index ab983d2..c677d2b 100644
--- a/tools/prj/makefile.mk
+++ b/tools/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)