mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tubes: tweak makefiles

Browse Source
This commit is contained in:
Matúš Kukan
2012-04-14 14:02:39 +02:00
parent a8ef97df50
commit b1de503a67
5 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@@ -1095,10 +1095,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$(TELEPATHY_CFLAGS) \ $(TELEPATHY_CFLAGS) \
) )
$(call gb_LinkTarget_add_defs,$(1),\
-DENABLE_TELEPATHY \
)
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
$(TELEPATHY_LIBS) \ $(TELEPATHY_LIBS) \
) )

4
sc/CppunitTest_sc_ucalc.mk
View File

@@ -49,8 +49,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc,\
tubes \ tubes \
)) ))
$(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
$$(TELEPATHY_LIBS) \ telepathy \
)) ))
endif endif

8
sc/Library_sc.mk
View File

@@ -48,14 +48,6 @@ $(eval $(call gb_Library_add_linked_libs,sc,\
tubes \ 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,\ $(eval $(call gb_Library_use_externals,sc,\
telepathy \ telepathy \
)) ))

24
tubes/CppunitTest_tubes_test.mk
View File

@@ -27,25 +27,27 @@
$(eval $(call gb_CppunitTest_CppunitTest,tubes_test)) $(eval $(call gb_CppunitTest_CppunitTest,tubes_test))
$(eval $(call gb_CppunitTest_add_exception_objects,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, \ $(eval $(call gb_CppunitTest_add_linked_libs,tubes_test, \
tubes \ sal \
sal \ tubes \
unotest \ unotest \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_CppunitTest_add_libs,tubes_test, \ $(eval $(call gb_CppunitTest_use_externals,tubes_test,\
$$(TELEPATHY_LIBS) \ telepathy \
)) ))
$(eval $(call gb_CppunitTest_set_include,tubes_test,\ $(eval $(call gb_CppunitTest_set_include,tubes_test,\
-I$(realpath $(SRCDIR)/tubes/inc) \ -I$(SRCDIR)/tubes/inc \
-I$(realpath $(OUTDIR)/inc/udkapi) \ $$(INCLUDE) \
$$(TELEPATHY_CFLAGS) \ ))
$$(INCLUDE) \
$(eval $(call gb_CppunitTest_add_api,tubes_test, \
udkapi \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

12
tubes/Library_tubes.mk
View File

@@ -28,20 +28,12 @@
$(eval $(call gb_Library_Library,tubes)) $(eval $(call gb_Library_Library,tubes))
$(eval $(call gb_Library_set_include,tubes,\ $(eval $(call gb_Library_set_include,tubes,\
-I$(realpath $(SRCDIR)/tubes/inc) \ -I$(SRCDIR)/tubes/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_defs,tubes,\ $(eval $(call gb_Library_add_defs,tubes,\
-DTUBES_DLLIMPLEMENTATION \ -DTUBES_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_add_cxxflags,tubes,\
$$(TELEPATHY_CFLAGS) \
))
$(eval $(call gb_Library_add_libs,tubes,\
$$(TELEPATHY_LIBS) \
)) ))
$(eval $(call gb_Library_add_linked_libs,tubes,\ $(eval $(call gb_Library_add_linked_libs,tubes,\