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)

21 files changed, 72 insertions, 72 deletions

diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index a44da3c6ca2e..49d3f2f9f273 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangesbase, \
     sc/qa/extras/sccellrangeobj\
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_cellrangesbase, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_cellrangesbase, \
     avmedia \
     basegfx \
     comphelper \
@@ -79,18 +79,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_cellrangesbase,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_cellrangesbase,\
+$(eval $(call gb_CppunitTest_use_api,sc_cellrangesbase,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_cellrangesbase))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_cellrangesbase,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\
+$(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 65af44861c28..0b7158074e91 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_chart_regression_test, \
     sc/qa/extras/regression-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_chart_regression_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -74,7 +74,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_chart_regression_test,\
+$(eval $(call gb_CppunitTest_use_api,sc_chart_regression_test,\
     offapi \
     oovbaapi \
     udkapi \
@@ -82,12 +82,12 @@ $(eval $(call gb_CppunitTest_add_api,sc_chart_regression_test,\
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_chart_regression_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_chart_regression_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_chart_regression_test,\
     oovbaapi \
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_chart_regression_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
     basic/util/sb \
     chart2/source/controller/chartcontroller \
     chart2/source/model/chartmodel \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 411901b411b1..3475740834ba 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \
     sc/qa/extras/scdatabaserangeobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_databaserangeobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
     avmedia \
     basegfx \
     comphelper \
@@ -78,18 +78,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_databaserangeobj,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_databaserangeobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_databaserangeobj,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_databaserangeobj))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_databaserangeobj,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_databaserangeobj,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_databaserangeobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index fe21d65d45bb..68c85d8bd62a 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \
     sc/qa/extras/scdatapilotfieldobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_datapilotfieldobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
     avmedia \
     basegfx \
     comphelper \
@@ -78,18 +78,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilotfieldobj,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_datapilotfieldobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldobj,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_datapilotfieldobj))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilotfieldobj,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_datapilotfieldobj,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index fdd1a53e1f77..0bd815641e8b 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \
     sc/qa/extras/scdatapilottableobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_datapilottableobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
     avmedia \
     basegfx \
     comphelper \
@@ -78,18 +78,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_datapilottableobj,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_datapilottableobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_datapilottableobj,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_datapilottableobj))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilottableobj,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_datapilottableobj,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_datapilottableobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index c81a6dbff73e..307a1e83e1e2 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_filters_test, \
     sc/qa/unit/filters-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -75,18 +75,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
+$(eval $(call gb_CppunitTest_use_api,sc_filters_test,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_filters_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
     basic/util/sb \
     chart2/source/controller/chartcontroller \
     chart2/source/tools/charttools \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index d0683f1710cc..e497f1ae9f52 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \
     sc/qa/extras/macros-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_macros_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -74,7 +74,7 @@ $(eval $(call gb_CppunitTest_set_include,sc_macros_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_macros_test,\
+$(eval $(call gb_CppunitTest_use_api,sc_macros_test,\
     offapi \
     oovbaapi \
     udkapi \
@@ -82,12 +82,12 @@ $(eval $(call gb_CppunitTest_add_api,sc_macros_test,\
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_macros_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_macros_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_macros_test,\
     oovbaapi \
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_macros_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 382138d91301..d9e7b4b74bb0 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangeobj, \
     sc/qa/extras/scnamedrangeobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_namedrangeobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
     avmedia \
     basegfx \
     comphelper \
@@ -78,18 +78,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangeobj,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_namedrangeobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_namedrangeobj,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_namedrangeobj))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_namedrangeobj,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_namedrangeobj,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_namedrangeobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index dd38ecf5ab36..805415e13897 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \
     sc/qa/extras/scnamedrangesobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_namedrangesobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
     avmedia \
     basegfx \
     comphelper \
@@ -78,18 +78,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_namedrangesobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_namedrangesobj,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_namedrangesobj))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_namedrangesobj,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_namedrangesobj,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_namedrangesobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 917ff9c9a49f..2f2a82631463 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_filters_test, \
     sc/qa/unit/subsequent_filters-test \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_subsequent_filters_test, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
     avmedia \
     basegfx \
     comphelper \
@@ -75,18 +75,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_subsequent_filters_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_subsequent_filters_test,\
+$(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_subsequent_filters_test))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_subsequent_filters_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_subsequent_filters_test,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     chart2/source/controller/chartcontroller \
     chart2/source/tools/charttools \
     chart2/source/model/chartmodel \
@@ -125,11 +125,11 @@ $(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
 
 ifeq ($(ENABLE_XMLSEC),YES)
 ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     xmlsecurity/util/xsec_xmlsec.windows \
 ))
 else
-$(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
+$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     xmlsecurity/util/xsec_xmlsec \
 ))
 endif
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 0a16b55318c8..b2cf36626d4a 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tableautoformatfield, \
     sc/qa/extras/tableautoformatfield \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_tableautoformatfield, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
     avmedia \
     basegfx \
     comphelper \
@@ -78,18 +78,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_tableautoformatfield,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_tableautoformatfield,\
+$(eval $(call gb_CppunitTest_use_api,sc_tableautoformatfield,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_tableautoformatfield))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_tableautoformatfield,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_tableautoformatfield,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_tableautoformatfield,\
+$(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index ce6c54d770b7..a5afbf777767 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetobj, \
     sc/qa/extras/sctablesheetobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_spreadsheetobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \
     avmedia \
     basegfx \
     comphelper \
@@ -79,18 +79,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetobj,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_spreadsheetobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_spreadsheetobj,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetobj))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_spreadsheetobj,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_spreadsheetobj,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_spreadsheetobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 15f9bf13842f..d30c53ec17a2 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetsobj, \
     sc/qa/extras/sctablesheetsobj \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_spreadsheetsobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \
     avmedia \
     basegfx \
     comphelper \
@@ -78,18 +78,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsobj,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_spreadsheetsobj,\
+$(eval $(call gb_CppunitTest_use_api,sc_spreadsheetsobj,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_spreadsheetsobj))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_spreadsheetsobj,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_spreadsheetsobj,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_spreadsheetsobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index d4de63ff57c3..0c893dc70622 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -43,7 +43,7 @@ $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
     $(call gb_Library_get_target,localedata_en) \
 
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
     avmedia \
     basegfx \
     comphelper \
@@ -82,18 +82,18 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sc_ucalc,\
+$(eval $(call gb_CppunitTest_use_api,sc_ucalc,\
     offapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_ucalc))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sc_ucalc,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sc_ucalc,\
+$(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
     configmgr/source/configmgr \
     framework/util/fwk \
     i18npool/util/i18npool \
diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index a54dee489fd9..ce0378c5e545 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_JunitTest_add_classes,sc_complex, \
     complex.sc.CalcRTL \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,sc_complex, \
+$(eval $(call gb_JunitTest_use_jars,sc_complex, \
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/jurt.jar \
     $(OUTDIR)/bin/ridl.jar \
diff --git a/sc/JunitTest_sc_unoapi.mk b/sc/JunitTest_sc_unoapi.mk
index 699daf4fa1fe..60be3e10920d 100644
--- a/sc/JunitTest_sc_unoapi.mk
+++ b/sc/JunitTest_sc_unoapi.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_JunitTest_add_classes,sc_unoapi, \
     org.openoffice.test.UnoApiTest \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,sc_unoapi, \
+$(eval $(call gb_JunitTest_use_jars,sc_unoapi, \
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/jurt.jar \
     $(OUTDIR)/bin/ridl.jar \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 3856a0891cd7..f1226e4a4fd5 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_defs,sc,\
 	-DSC_INFO_OSVERSION=\"$(OS)\" \
 ))
 
-$(eval $(call gb_Library_add_api,sc,\
+$(eval $(call gb_Library_use_api,sc,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,sc,\
+$(eval $(call gb_Library_use_libraries,sc,\
 	avmedia \
 	basegfx \
 	comphelper \
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 0805970905e7..c85f0397d040 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_set_include,scd,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,scd,\
+$(eval $(call gb_Library_use_api,scd,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,scd,\
+$(eval $(call gb_Library_use_libraries,scd,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index b524ee09878c..61b7f9dcde24 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,scfilt,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,scfilt,\
+$(eval $(call gb_Library_use_api,scfilt,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,scfilt,\
+$(eval $(call gb_Library_use_libraries,scfilt,\
 	basegfx \
 	comphelper \
 	cppu \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 08238f792f36..9af5a6356ac2 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,scui,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,scui,\
+$(eval $(call gb_Library_use_api,scui,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,scui,\
+$(eval $(call gb_Library_use_libraries,scui,\
 	comphelper \
 	cppu \
 	editeng \
@@ -114,7 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,scui,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,scui,\
+$(eval $(call gb_Library_use_libraries,scui,\
 	advapi32 \
 	$(gb_Library_win32_OLDNAMES) \
 	uwinapi \
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 982848c2df02..fd12ab508b42 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -36,13 +36,13 @@ $(eval $(call gb_Library_add_defs,vbaobj,\
 	-DVBA_OOBUILD_HACK \
 ))
 
-$(eval $(call gb_Library_add_api,vbaobj,\
+$(eval $(call gb_Library_use_api,vbaobj,\
     offapi \
     oovbaapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vbaobj,\
+$(eval $(call gb_Library_use_libraries,vbaobj,\
 	comphelper \
 	cppu \
 	cppuhelper \
@@ -150,7 +150,7 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,vbaobj,\
+$(eval $(call gb_Library_use_libraries,vbaobj,\
 	advapi32 \
 	$(gb_Library_win32_OLDNAMES) \
 	uwinapi \