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)

7 files changed, 16 insertions, 16 deletions

diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 15fac3390d78..671fb3ded20f 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svtools_filters_test, \
     svtools/qa/cppunit/filters-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,svtools_filters_test, \
+$(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \
 	comphelper \
 	cppu \
 	cppuhelper \
@@ -48,18 +48,18 @@ $(eval $(call gb_CppunitTest_set_include,svtools_filters_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,svtools_filters_test,\
+$(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\
     udkapi \
     offapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,svtools_filters_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,svtools_filters_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,svtools_filters_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,svtools_filters_test,\
+$(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\
     configmgr/source/configmgr \
 ))
 
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 428a5a14157a..e664c2c257cc 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Executable_set_include,bmp,\
     -I$(SRCDIR)/svtools/source/inc \
 ))
 
-$(eval $(call gb_Executable_add_api,bmp,\
+$(eval $(call gb_Executable_use_api,bmp,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,bmp,\
+$(eval $(call gb_Executable_use_libraries,bmp,\
     sal \
     comphelper \
     tl \
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 569281a3e492..8d03b5768d9d 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,bmpsum,\
     -I$(SRCDIR)/svtools/inc/svtools \
 ))
 
-$(eval $(call gb_Executable_add_api,bmpsum,\
+$(eval $(call gb_Executable_use_api,bmpsum,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
+$(eval $(call gb_Executable_use_libraries,bmpsum,\
     sal \
     comphelper \
     tl \
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 656aad97e3f9..7c2193f5538a 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,g2g,\
     -I$(SRCDIR)/svtools/inc/svtools \
 ))
 
-$(eval $(call gb_Executable_add_api,g2g,\
+$(eval $(call gb_Executable_use_api,g2g,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,g2g,\
+$(eval $(call gb_Executable_use_libraries,g2g,\
     jvmfwk \
     sal \
     svt \
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index 386b06f9d885..b79728d5408b 100644
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svtools/qa/unoapi/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,svtools_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,svtools_unoapi,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 25f696998598..fd89a7dd4933 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
     -I$(SRCDIR)/svtools/inc \
 ))
 
-$(eval $(call gb_Library_add_api,hatchwindowfactory,\
+$(eval $(call gb_Library_use_api,hatchwindowfactory,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
+$(eval $(call gb_Library_use_libraries,hatchwindowfactory,\
     cppu \
     cppuhelper \
     sal \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 55b651506d61..73f1e212319d 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_add_package_headers,svt,svtools_inc))
 
 $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
 
-$(eval $(call gb_Library_add_api,svt,\
+$(eval $(call gb_Library_use_api,svt,\
 	udkapi \
 	offapi \
 ))
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,svt,\
     -DSVT_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,svt,\
+$(eval $(call gb_Library_use_libraries,svt,\
     basegfx \
     comphelper \
     cppu \
@@ -274,7 +274,7 @@ $(eval $(call gb_Library_add_cobjects,svt,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,svt,\
+$(eval $(call gb_Library_use_libraries,svt,\
     advapi32 \
     gdi32 \
     ole32 \