[Libreoffice-commits] .: 2 commits - lotuswordpro/Library_lwpft.mk lotuswordpro/Module_lotuswordpro.mk lotuswordpro/prj

Caolán McNamara caolan at kemper.freedesktop.org
Sat Apr 16 08:22:46 PDT 2011


 lotuswordpro/Library_lwpft.mk       |    5 ++---
 lotuswordpro/Module_lotuswordpro.mk |    2 +-
 lotuswordpro/prj/build.lst          |    3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 0479e21e914dc1ca9adba8dfbf2f0fc320726617
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 16 16:20:50 2011 +0100

    I want to have one depend on the other, sigh

diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk
index 9a0e632..59c9a6c 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Module_add_targets,lotuswordpro,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,lotuswordpro,\
-    CppunitTest_lotuswordpro_test_lotuswordpro \
     Package_qa_cppunit \
+    CppunitTest_lotuswordpro_test_lotuswordpro \
 ))
 
 # vim: set noet ts=4 sw=4:
diff --git a/lotuswordpro/prj/build.lst b/lotuswordpro/prj/build.lst
index 309fdc8..bee325f 100644
--- a/lotuswordpro/prj/build.lst
+++ b/lotuswordpro/prj/build.lst
@@ -1,3 +1,2 @@
-wp	lotuswordpro : sfx2 sot svx comphelper BOOST:boost NULL
-wp	lotuswordpro			usr1	-	all	lwp_mkout NULL
+wp	lotuswordpro : sfx2 sot svx comphelper BOOST:boost ure NULL
 wp	lotuswordpro\prj	nmake	-	all	lwp_prj NULL
commit 92ba496729d71ad5edb6ccda2cbd71d118393d5b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 15 21:10:08 2011 +0100

    I don't think we need icule

diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 5654e83..b9fd74a 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -37,9 +37,6 @@ $(eval $(call gb_Library_add_linked_libs,lwpft,\
     comphelper \
     cppu \
     cppuhelper \
-    icui18n \
-    icule \
-    icuuc \
     sal \
     sfx \
     sot \
@@ -48,6 +45,8 @@ $(eval $(call gb_Library_add_linked_libs,lwpft,\
     tl \
     ucbhelper \
     vcl \
+    icui18n \
+    icuuc \
     xo \
     $(gb_STDLIBS) \
 ))


More information about the Libreoffice-commits mailing list