7 files changed, 20 insertions, 20 deletions
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 3dae1927eff4..9f27654e648d 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_defs,sdext_pdfimport,\
         $(dir $(call gb_Executable_get_target,xpdfimport)))\" \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,sdext_pdfimport,\
+$(eval $(call gb_CppunitTest_use_api,sdext_pdfimport,\
     offapi \
     udkapi \
 ))
@@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_use_externals,sdext_pdfimport,\
     zlib \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_libs,sdext_pdfimport,\
+$(eval $(call gb_CppunitTest_use_libraries,sdext_pdfimport,\
     comphelper \
     cppu \
     cppuhelper \
@@ -56,7 +56,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sdext_pdfimport,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_add_linked_static_libs,sdext_pdfimport,\
+$(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\
     basegfx_s \
     pdfimport_s \
 ))
@@ -67,11 +67,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
 
 $(eval $(call gb_CppunitTest_uses_ure,sdext_pdfimport))
 
-$(eval $(call gb_CppunitTest_add_type_rdbs,sdext_pdfimport,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,sdext_pdfimport,\
     types \
 ))
 
-$(eval $(call gb_CppunitTest_add_components,sdext_pdfimport,\
+$(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     i18npool/util/i18npool \
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index 681d77fca12b..dbca4d98dc50 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Executable_Executable,pdf2xml))
 
-$(eval $(call gb_Executable_add_api,pdf2xml,\
+$(eval $(call gb_Executable_use_api,pdf2xml,\
     offapi \
     udkapi \
 ))
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_set_include,pdf2xml,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,pdf2xml,\
+$(eval $(call gb_Executable_use_libraries,pdf2xml,\
     basegfx \
     comphelper \
     cppu \
@@ -49,7 +49,7 @@ $(eval $(call gb_Executable_add_linked_libs,pdf2xml,\
     sal \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,pdf2xml,\
+$(eval $(call gb_Executable_use_static_libraries,pdf2xml,\
     pdfimport_s \
 ))
 
diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index d073c0548044..5bb90b5e0206 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/sdext/Executable_pdfunzip.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Executable_Executable,pdfunzip))
 
-$(eval $(call gb_Executable_add_api,pdfunzip,\
+$(eval $(call gb_Executable_use_api,pdfunzip,\
     offapi \
     udkapi \
 ))
@@ -41,14 +41,14 @@ $(eval $(call gb_Executable_set_include,pdfunzip,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,pdfunzip,\
+$(eval $(call gb_Executable_use_libraries,pdfunzip,\
     basegfx \
     cppu \
     cppuhelper \
     sal \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,pdfunzip,\
+$(eval $(call gb_Executable_use_static_libraries,pdfunzip,\
     pdfimport_s \
 ))
 
diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk
index f00fc5ff19be..141199d0e2db 100644
--- a/sdext/Library_minimizer.mk
+++ b/sdext/Library_minimizer.mk
@@ -27,12 +27,12 @@
 
 $(eval $(call gb_Library_Library,SunPresentationMinimizer))
 
-$(eval $(call gb_Library_add_api,SunPresentationMinimizer,\
+$(eval $(call gb_Library_use_api,SunPresentationMinimizer,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,SunPresentationMinimizer,\
+$(eval $(call gb_Library_use_libraries,SunPresentationMinimizer,\
     cppu \
     cppuhelper \
     sal \
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 43fd1938ef3c..01d14318ebb9 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,pdfimport))
 
-$(eval $(call gb_Library_add_api,pdfimport,\
+$(eval $(call gb_Library_use_api,pdfimport,\
     offapi \
     udkapi \
 ))
@@ -37,13 +37,13 @@ $(eval $(call gb_Library_set_include,pdfimport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,pdfimport,\
+$(eval $(call gb_Library_use_libraries,pdfimport,\
     cppu \
     cppuhelper \
     sal \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,pdfimport,\
+$(eval $(call gb_Library_use_static_libraries,pdfimport,\
     basegfx_s \
     pdfimport_s \
 ))
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index eb9ec9586c8c..7cefb48fb395 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,PresenterScreen))
 
-$(eval $(call gb_Library_add_api,PresenterScreen,\
+$(eval $(call gb_Library_use_api,PresenterScreen,\
     offapi \
     udkapi \
 ))
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_defs,PresenterScreen,\
     -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,PresenterScreen,\
+$(eval $(call gb_Library_use_libraries,PresenterScreen,\
     cppu \
     cppuhelper \
     sal \
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 7bebdd722536..699e3e7df185 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -29,7 +29,7 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
 
-$(eval $(call gb_StaticLibrary_add_api,pdfimport_s,\
+$(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\
     offapi \
     udkapi \
 ))
@@ -38,7 +38,7 @@ $(eval $(call gb_StaticLibrary_use_externals,pdfimport_s,\
     zlib \
 ))
 
-$(eval $(call gb_StaticLibrary_add_custom_headers,pdfimport_s,sdext/pdfimport))
+$(eval $(call gb_StaticLibrary_use_custom_headers,pdfimport_s,sdext/pdfimport))
 
 $(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\
     -I$(SRCDIR)/sdext/source/pdfimport/inc \