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)

14 files changed, 41 insertions, 41 deletions

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index b9730cf30b5b..614cf194f887 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \
 
 $(call gb_CxxObject_get_target,sw/qa/core/filters-test): $(WORKDIR)/AllLangRes/sw
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_filters_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
     sw \
     sfx \
     svl \
@@ -66,18 +66,18 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sw_filters_test,\
+$(eval $(call gb_CppunitTest_use_api,sw_filters_test,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sw_filters_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sw_filters_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sw_filters_test,\
+$(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     dbaccess/util/dba \
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index cbf8c6aa1c63..3891c383f689 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \
     sw/qa/core/layout-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_layout_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -75,7 +75,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sw_layout_test,\
+$(eval $(call gb_CppunitTest_use_api,sw_layout_test,\
     offapi \
     oovbaapi \
     udkapi \
@@ -83,12 +83,12 @@ $(eval $(call gb_CppunitTest_add_api,sw_layout_test,\
 
 $(eval $(call gb_CppunitTest_uses_ure,sw_layout_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_layout_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sw_layout_test,\
     oovbaapi \
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sw_layout_test,\
+$(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     dbaccess/util/dba \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 1d287fbbc4ec..fb4d8ec65815 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \
     sw/qa/core/macros-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_macros_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -76,7 +76,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sw_macros_test,\
+$(eval $(call gb_CppunitTest_use_api,sw_macros_test,\
     offapi \
     oovbaapi \
     udkapi \
@@ -84,12 +84,12 @@ $(eval $(call gb_CppunitTest_add_api,sw_macros_test,\
 
 $(eval $(call gb_CppunitTest_uses_ure,sw_macros_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_macros_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sw_macros_test,\
     oovbaapi \
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sw_macros_test,\
+$(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index 27b9c07c90a5..f98aa6162310 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_regression_test, \
     sw/qa/extras/regression-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_regression_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -76,7 +76,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_regression_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sw_regression_test,\
+$(eval $(call gb_CppunitTest_use_api,sw_regression_test,\
     offapi \
     oovbaapi \
     udkapi \
@@ -84,12 +84,12 @@ $(eval $(call gb_CppunitTest_add_api,sw_regression_test,\
 
 $(eval $(call gb_CppunitTest_uses_ure,sw_regression_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_regression_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sw_regression_test,\
     oovbaapi \
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sw_regression_test,\
+$(eval $(call gb_CppunitTest_use_components,sw_regression_test,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
index dfc7f4456d11..0b73c55a2fe9 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmltok, \
     sw/qa/extras/ooxmltok/ooxmltok \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_ooxmltok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \
     cppu \
     sal \
     test \
@@ -43,18 +43,18 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_ooxmltok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_ooxmltok))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sw_subsequent_ooxmltok,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk
index fd2aa19f4b46..0e04dc012204 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \
     sw/qa/extras/rtftok/rtftok \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_rtftok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \
     cppu \
     sal \
     test \
@@ -43,18 +43,18 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_rtftok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_rtftok))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sw_subsequent_rtftok,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
     filter/source/config/cache/filterconfig1 \
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 34d32f9c2889..086c4eec2743 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_swdoc_test, \
     sw/qa/core/Test-BigPtrArray \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_swdoc_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -80,18 +80,18 @@ $(eval $(call gb_CppunitTest_set_include,sw_swdoc_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sw_swdoc_test,\
+$(eval $(call gb_CppunitTest_use_api,sw_swdoc_test,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sw_swdoc_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\
+$(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 381417bf2b38..fbfb740c02b9 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
     sw/qa/complex/writer/TextPortionEnumerationTest \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,sw_complex,\
+$(eval $(call gb_JunitTest_use_jars,sw_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index 157dd703ab7d..d11a9638efb2 100644
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,sw_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,sw_unoapi,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 002621839617..8507bc1d7ddb 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,msword))
 
 $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
 
-$(eval $(call gb_Library_add_external_headers,msword,writerfilter_sprmids))
+$(eval $(call gb_Library_use_package,msword,writerfilter_sprmids))
 
 $(eval $(call gb_Library_set_include,msword,\
     -I$(SRCDIR)/sw/source/core/inc \
@@ -40,12 +40,12 @@ $(eval $(call gb_Library_set_include,msword,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,msword,\
+$(eval $(call gb_Library_use_api,msword,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,msword,\
+$(eval $(call gb_Library_use_libraries,msword,\
     basegfx \
     comphelper \
     cppu \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 4d5cdd64d91a..45975a0f800a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,sw,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,sw,\
+$(eval $(call gb_Library_use_api,sw,\
 	udkapi \
 	offapi \
 ))
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_defs,sw,\
     -DSW_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,sw,\
+$(eval $(call gb_Library_use_libraries,sw,\
     avmedia \
     basegfx \
     comphelper \
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index a9e8832d10f2..e084ea7f02cf 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,swd,\
     -I$(SRCDIR)/sw/source/ui/inc \
 ))
 
-$(eval $(call gb_Library_add_api,swd,\
+$(eval $(call gb_Library_use_api,swd,\
 	udkapi \
 	offapi \
 ))
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,swd,\
     -DSWD_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,swd,\
+$(eval $(call gb_Library_use_libraries,swd,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 7f2cee9e9e82..3dd01176f8c0 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,swui,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,swui,\
+$(eval $(call gb_Library_use_api,swui,\
 	udkapi \
 	offapi \
 ))
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_cxxflags,swui,\
 ))
 endif
 
-$(eval $(call gb_Library_add_linked_libs,swui,\
+$(eval $(call gb_Library_use_libraries,swui,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 546e6a7462cd..e77dc7823d43 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -38,13 +38,13 @@ $(eval $(call gb_Library_set_include,vbaswobj,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,vbaswobj,\
+$(eval $(call gb_Library_use_api,vbaswobj,\
 	udkapi \
 	offapi \
 	oovbaapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
+$(eval $(call gb_Library_use_libraries,vbaswobj,\
     comphelper \
     cppu \
     cppuhelper \