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)

6 files changed, 13 insertions, 13 deletions

diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk
index 27b53d856de9..13c663afc7cd 100644
--- a/tools/CppunitTest_tools_test.mk
+++ b/tools/CppunitTest_tools_test.mk
@@ -38,18 +38,18 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \
     tools/qa/cppunit/test_urlobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,tools_test, \
+$(eval $(call gb_CppunitTest_use_api,tools_test, \
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,tools_test, \
+$(eval $(call gb_CppunitTest_use_libraries,tools_test, \
     sal \
     tl \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_static_libs,tools_test, \
+$(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \
     ooopathutils \
 ))
 
diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk
index 0468c4906c40..4f12051d4d76 100644
--- a/tools/Executable_bestreversemap.mk
+++ b/tools/Executable_bestreversemap.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,bestreversemap,\
+$(eval $(call gb_Executable_use_libraries,bestreversemap,\
 	sal \
 	$(gb_STDLIBS) \
 ))
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 3b5d4379121f..4fc68129aeb5 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_add_defs,mkunroll,\
     -D_TOOLS_STRINGLIST \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
+$(eval $(call gb_Executable_use_libraries,mkunroll,\
     basegfx \
     sal \
     tl \
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 720d466d6b22..21171625b829 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -38,14 +38,14 @@ $(eval $(call gb_Executable_add_defs,rscdep,\
     -D_TOOLS_STRINGLIST \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
+$(eval $(call gb_Executable_use_libraries,rscdep,\
     comphelper \
     sal \
     tl \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_api,rscdep,\
+$(eval $(call gb_Executable_use_api,rscdep,\
     udkapi \
     offapi \
 ))
@@ -62,7 +62,7 @@ $(eval $(call gb_Executable_add_defs,rscdep,\
     -DHAVE_GETOPT \
 ))
 else
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
+$(eval $(call gb_Executable_use_libraries,rscdep,\
     gnu_getopt \
 ))
 endif
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 673fa8dc94eb..9336ab7583ef 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_add_defs,so_checksum,\
     -D_TOOLS_STRINGLIST \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
+$(eval $(call gb_Executable_use_libraries,so_checksum,\
     sal \
     tl \
     $(gb_STDLIBS) \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 988f569bbe2e..cddc0cc89774 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,tl))
 
 $(eval $(call gb_Library_add_package_headers,tl,tools_inc))
 
-$(eval $(call gb_Library_add_custom_headers,tl,tools/reversemap))
+$(eval $(call gb_Library_use_custom_headers,tl,tools/reversemap))
 
 $(eval $(call gb_Library_set_include,tl,\
     -I$(SRCDIR)/tools/inc \
@@ -41,12 +41,12 @@ $(eval $(call gb_Library_add_defs,tl,\
     -DTOOLS_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_api,tl,\
+$(eval $(call gb_Library_use_api,tl,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,tl,\
+$(eval $(call gb_Library_use_libraries,tl,\
     basegfx \
     comphelper \
     i18nisolang1 \
@@ -130,7 +130,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/win/source/dll/toolsdll \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,tl,\
+$(eval $(call gb_Library_use_libraries,tl,\
     mpr \
     ole32 \
     shell32 \