[Libreoffice-commits] .: Branch 'feature/tubes2' - RepositoryExternal.mk sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk tubes/CppunitTest_tubes_test.mk tubes/Library_tubes.mk

[Matus Kukan]

 RepositoryExternal.mk           |    4 ----
 sc/CppunitTest_sc_ucalc.mk      |    4 ++--
 sc/Library_sc.mk                |    8 --------
 tubes/CppunitTest_tubes_test.mk |   24 +++++++++++++-----------
 tubes/Library_tubes.mk          |   12 ++----------
 5 files changed, 17 insertions(+), 35 deletions(-)

New commits:
commit d5877ec0738429b54e9ceeea745054404430d734
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Apr 14 14:02:39 2012 +0200

    tubes: tweak makefiles

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4312180..b989915 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -922,10 +922,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$(TELEPATHY_CFLAGS) \
 )
 
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DENABLE_TELEPATHY \
-)
-
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(TELEPATHY_LIBS) \
 )
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index b4a9a89..e4c23e9 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -51,8 +51,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc,\
 	tubes \
 ))
 
-$(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\
-    $$(TELEPATHY_LIBS) \
+$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
+	telepathy \
 ))
 
 endif
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 3132603..a1dec5e 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -52,14 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,sc,\
 	tubes \
 ))
 
-$(eval $(call gb_Library_add_cxxflags,sc,\
-	$$(TELEPATHY_CFLAGS) \
-))
-
-$(eval $(call gb_Library_add_libs,sc,\
-	$$(TELEPATHY_LIBS) \
-))
-
 $(eval $(call gb_Library_use_externals,sc,\
 	telepathy \
 ))
diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk
index 57a53a5..b2c90d4 100644
--- a/tubes/CppunitTest_tubes_test.mk
+++ b/tubes/CppunitTest_tubes_test.mk
@@ -27,25 +27,27 @@
 $(eval $(call gb_CppunitTest_CppunitTest,tubes_test))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,tubes_test, \
-    tubes/qa/test_manager \
+	tubes/qa/test_manager \
 ))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,tubes_test, \
-    tubes \
-    sal \
-    unotest \
-    $(gb_STDLIBS) \
+	sal \
+	tubes \
+	unotest \
+	$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_add_libs,tubes_test, \
-    $$(TELEPATHY_LIBS) \
+$(eval $(call gb_CppunitTest_use_externals,tubes_test,\
+	telepathy \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,tubes_test,\
-    -I$(realpath $(SRCDIR)/tubes/inc) \
-    -I$(realpath $(OUTDIR)/inc/udkapi) \
-    $$(TELEPATHY_CFLAGS) \
-    $$(INCLUDE) \
+	-I$(SRCDIR)/tubes/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_add_api,tubes_test, \
+	udkapi \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk
index c11268c..98b1766 100644
--- a/tubes/Library_tubes.mk
+++ b/tubes/Library_tubes.mk
@@ -28,20 +28,12 @@
 $(eval $(call gb_Library_Library,tubes))
 
 $(eval $(call gb_Library_set_include,tubes,\
-	-I$(realpath $(SRCDIR)/tubes/inc) \
+	-I$(SRCDIR)/tubes/inc \
 	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,tubes,\
-       -DTUBES_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_add_cxxflags,tubes,\
-    $$(TELEPATHY_CFLAGS) \
-))
-
-$(eval $(call gb_Library_add_libs,tubes,\
-    $$(TELEPATHY_LIBS) \
+	-DTUBES_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,tubes,\