diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-14 14:02:39 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:10 +0200 |
| commit | b1de503a677dfe3b4306ad0a0b80a19ceaaea496 (patch) | |
| tree | 8d690599c4ba980d8429db87a2d4501d65aa0282 | |
| parent | a8ef97df50dfd18e2bcccc760918c6ba9d4b4a93 (diff) | |
tubes: tweak makefiles
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 4 | ||||
| -rw-r--r-- | sc/Library_sc.mk | 8 | ||||
| -rw-r--r-- | tubes/CppunitTest_tubes_test.mk | 24 | ||||
| -rw-r--r-- | tubes/Library_tubes.mk | 12 |
5 files changed, 17 insertions, 35 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8a2c88d91446..26676a786d9a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1095,10 +1095,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 0b411700f0d9..4f996fd6ec95 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -49,8 +49,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 eed2326cc79d..551ad07df564 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -48,14 +48,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 57a53a5b1d35..b2c90d4bce2a 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 c11268c84302..98b1766d2e40 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,\ |