8 files changed, 15 insertions, 15 deletions
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
index 2283cb1208b1..6e25351e5c7b 100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,framework_complex,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,framework_complex,\
+$(eval $(call gb_JunitTest_use_jars,framework_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
index d9d2177655b6..e48f74098636 100644
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/unoapi/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,framework_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,framework_unoapi,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 3fbc7360f688..4513bcca8b68 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -38,12 +38,12 @@ $(eval $(call gb_Library_add_defs,fwe,\
     -DFWE_DLLIMPLEMENTATION\
 ))
 
-$(eval $(call gb_Library_add_api,fwe,\
+$(eval $(call gb_Library_use_api,fwe,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fwe,\
+$(eval $(call gb_Library_use_libraries,fwe,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 45e1440f9293..98774bb32317 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_defs,fwi,\
     -DFWI_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_api,fwi,\
+$(eval $(call gb_Library_use_api,fwi,\
 	udkapi \
 	offapi \
 ))
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_set_include,fwi,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fwi,\
+$(eval $(call gb_Library_use_libraries,fwi,\
     comphelper \
     cppu \
     cppuhelper \
@@ -77,7 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,fwi,\
+$(eval $(call gb_Library_use_libraries,fwi,\
     advapi32 \
 ))
 endif
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 45796693d7f3..b78dd0c4aa06 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,fwk,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,fwk,\
+$(eval $(call gb_Library_use_api,fwk,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fwk,\
+$(eval $(call gb_Library_use_libraries,fwk,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 0f81cf03ab9c..c9bda5bb1be2 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,fwl,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,fwl,\
+$(eval $(call gb_Library_use_api,fwl,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fwl,\
+$(eval $(call gb_Library_use_libraries,fwl,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index e21bd8cf6941..d704d162e5b0 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,fwm,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,fwm,\
+$(eval $(call gb_Library_use_api,fwm,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,fwm,\
+$(eval $(call gb_Library_use_libraries,fwm,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
index 153b991af278..302ad5a3a740 100644
--- a/framework/Library_lomenubar.mk
+++ b/framework/Library_lomenubar.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,lomenubar))
 $(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
 
 
-$(eval $(call gb_Library_add_api,lomenubar,\
+$(eval $(call gb_Library_use_api,lomenubar,\
     offapi \
     udkapi \
 ))
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_externals,lomenubar,\
 	dbusmenugtk \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,lomenubar,\
+$(eval $(call gb_Library_use_libraries,lomenubar,\
 	sal \
 	cppu \
 	cppuhelper \