[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - sc/CppunitTest_sc_ucalc.mk scp2/source

[Eike Rathke]

 sc/CppunitTest_sc_ucalc.mk           |    8 +++++++-
 scp2/source/ooo/file_library_ooo.scp |    4 ++++
 scp2/source/ooo/makefile.mk          |    4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit e3a0e3d5e662d6b4b92f2157daf84da83f3a2685
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Mar 29 01:02:25 2012 +0200

    tubes: link libraries to unit test

diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index cf81696..b4a9a89 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -46,9 +46,15 @@ $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
 
 
 ifeq ($(ENABLE_TELEPATHY),TRUE)
-$(eval $(call gb_Library_add_linked_libs,sc_ucalc,\
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc,\
 	tubes \
 ))
+
+$(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\
+    $$(TELEPATHY_LIBS) \
+))
+
 endif
 
 $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
commit f188eaaa96660a539b6b9b19bc999f1bccb14df7
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Mar 28 20:56:27 2012 +0200

    tubes: include libtubes in instset

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1b464cf..ceecfc3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1809,3 +1809,7 @@ End
 #ifdef ENABLE_LOMENUBAR
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno )
 #endif
+
+#ifdef ENABLE_TELEPATHY
+STD_LIB_FILE( gid_File_Lib_Tubes , tubes)
+#endif
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0987f6f..3bc4e1b 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -302,6 +302,10 @@ SCPDEFS+=-DENABLE_LOMENUBAR
 SCPDEFS+=-DHAVE_WINDOWS_SDK
 .ENDIF
 
+.IF "$(ENABLE_TELEPATHY)" == "TRUE"
+SCPDEFS+=-DENABLE_TELEPATHY
+.ENDIF
+
 SCP_PRODUCT_TYPE=osl
 
 ICUVERSION_DEPENDENT_FILES= \