From c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 7 Apr 2012 23:22:08 +0200 Subject: gbuild: "use" vs. "add": Naming convention for gbuild methods: - "add" is used for stuff that is logically a part of the target (i.e. not registered at the Module, but defined in the target's makefile) - "use" is used for stuff that is logically a different target (i.e. it is registered at the Module, has it's own makefile, may be in a different module than the target) --- writerfilter/CppunitTest_writerfilter_doctok.mk | 4 ++-- writerfilter/CppunitTest_writerfilter_rtftok.mk | 8 ++++---- writerfilter/JunitTest_writerfilter_complex.mk | 2 +- writerfilter/Library_doctok.mk | 4 ++-- writerfilter/Library_ooxml.mk | 4 ++-- writerfilter/Library_resourcemodel.mk | 6 +++--- writerfilter/Library_rtftok.mk | 4 ++-- writerfilter/Library_writerfilter.mk | 4 ++-- writerfilter/Library_writerfilter_uno.mk | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index f694d45b26ce..af137ec4f01c 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \ writerfilter/qa/cppunittests/doctok/testdoctok \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \ +$(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ cppu \ cppuhelper \ doctok \ @@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ -I$(SRCDIR)/writerfilter/inc \ )) -$(eval $(call gb_CppunitTest_add_api,writerfilter_doctok,\ +$(eval $(call gb_CppunitTest_use_api,writerfilter_doctok,\ offapi \ udkapi \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 564a73adae18..64ef3d02e8b3 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \ writerfilter/qa/cppunittests/rtftok/testrtftok \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_rtftok, \ +$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ comphelper \ cppu \ cppuhelper \ @@ -47,18 +47,18 @@ $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_rtftok, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_api,writerfilter_rtftok,\ +$(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,writerfilter_rtftok)) -$(eval $(call gb_CppunitTest_add_type_rdbs,writerfilter_rtftok,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,writerfilter_rtftok,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,writerfilter_rtftok,\ +$(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ configmgr/source/configmgr \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk index d9d1a5cf727b..360f86c01e0f 100644 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ b/writerfilter/JunitTest_writerfilter_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,writerfilter_complex,\ +$(eval $(call gb_JunitTest_use_jars,writerfilter_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk index 8c7eaea0ce9b..501bc29f816e 100644 --- a/writerfilter/Library_doctok.mk +++ b/writerfilter/Library_doctok.mk @@ -44,12 +44,12 @@ $(eval $(call gb_Library_add_defs,doctok,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_api,doctok,\ +$(eval $(call gb_Library_use_api,doctok,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,doctok,\ +$(eval $(call gb_Library_use_libraries,doctok,\ cppu \ cppuhelper \ resourcemodel \ diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk index 787f6b730b89..aae025f719d0 100644 --- a/writerfilter/Library_ooxml.mk +++ b/writerfilter/Library_ooxml.mk @@ -45,12 +45,12 @@ $(eval $(call gb_Library_add_defs,ooxml,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_api,ooxml,\ +$(eval $(call gb_Library_use_api,ooxml,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ooxml,\ +$(eval $(call gb_Library_use_libraries,ooxml,\ comphelper \ cppu \ cppuhelper \ diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk index 4583db410704..aa3d2844b264 100644 --- a/writerfilter/Library_resourcemodel.mk +++ b/writerfilter/Library_resourcemodel.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,resourcemodel)) -$(eval $(call gb_Library_add_custom_headers,resourcemodel,writerfilter/source)) +$(eval $(call gb_Library_use_custom_headers,resourcemodel,writerfilter/source)) $(eval $(call gb_Library_set_include,resourcemodel,\ $$(INCLUDE) \ @@ -41,12 +41,12 @@ $(eval $(call gb_Library_add_defs,resourcemodel,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_api,resourcemodel,\ +$(eval $(call gb_Library_use_api,resourcemodel,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,resourcemodel,\ +$(eval $(call gb_Library_use_libraries,resourcemodel,\ comphelper \ cppu \ cppuhelper \ diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk index 392de9380a40..5521362eeca7 100644 --- a/writerfilter/Library_rtftok.mk +++ b/writerfilter/Library_rtftok.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,rtftok,\ -I$(WORKDIR)/CustomTarget/writerfilter/source \ )) -$(eval $(call gb_Library_add_api,rtftok,\ +$(eval $(call gb_Library_use_api,rtftok,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,rtftok,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_linked_libs,rtftok,\ +$(eval $(call gb_Library_use_libraries,rtftok,\ cppu \ cppuhelper \ oox \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index b77be991945a..ce15f01938d1 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_include,writerfilter,\ -I$(SRCDIR)/writerfilter/inc \ )) -$(eval $(call gb_Library_add_api,writerfilter,\ +$(eval $(call gb_Library_use_api,writerfilter,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,writerfilter,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_linked_libs,writerfilter,\ +$(eval $(call gb_Library_use_libraries,writerfilter,\ resourcemodel \ comphelper \ cppu \ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index 2ea4f9782032..714d6a7b52cd 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Library_add_defs,writerfilter_uno,\ -DWRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,writerfilter_uno,\ +$(eval $(call gb_Library_use_api,writerfilter_uno,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\ +$(eval $(call gb_Library_use_libraries,writerfilter_uno,\ comphelper \ cppu \ cppuhelper \ -- cgit v1.2.3