diff options
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/CppunitTest_sfx2_metadatable.mk | 4 | ||||
-rw-r--r-- | sfx2/JunitTest_sfx2_complex.mk | 2 | ||||
-rw-r--r-- | sfx2/JunitTest_sfx2_unoapi.mk | 2 | ||||
-rw-r--r-- | sfx2/Library_qstart.mk | 4 | ||||
-rw-r--r-- | sfx2/Library_sfx.mk | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 2047e874a3a2..92893b786ee3 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -32,12 +32,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \ sfx2/qa/cppunit/test_metadatable \ )) -$(eval $(call gb_CppunitTest_add_api,sfx2_metadatable, \ +$(eval $(call gb_CppunitTest_use_api,sfx2_metadatable, \ udkapi \ offapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ +$(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ $(gb_STDLIBS) \ diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index 972f5aab80d9..3717cb5f2161 100644 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/sfx2/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,sfx2_complex,\ +$(eval $(call gb_JunitTest_use_jars,sfx2_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk index cd5bec92f110..c6f549d24367 100644 --- a/sfx2/JunitTest_sfx2_unoapi.mk +++ b/sfx2/JunitTest_sfx2_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,sfx2_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,sfx2_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index f4b67831428c..aa0a5495aa48 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\ -I$(SRCDIR)/sfx2/inc/sfx2 \ )) -$(eval $(call gb_Library_add_api,qstart_gtk,\ +$(eval $(call gb_Library_use_api,qstart_gtk,\ udkapi \ offapi \ )) @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_defs,qstart_gtk,\ )) endif -$(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ +$(eval $(call gb_Library_use_libraries,qstart_gtk,\ comphelper \ cppu \ cppuhelper \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index a1db033b43d1..6ac26b88c7b9 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) -$(eval $(call gb_Library_add_api,sfx,\ +$(eval $(call gb_Library_use_api,sfx,\ udkapi \ offapi \ )) @@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_defs,sfx,\ )) endif -$(eval $(call gb_Library_add_linked_libs,sfx,\ +$(eval $(call gb_Library_use_libraries,sfx,\ comphelper \ cppu \ cppuhelper \ @@ -259,7 +259,7 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,sfx,\ sfx2/source/appl/shutdowniconaqua \ )) -$(eval $(call gb_Library_add_linked_libs,sfx,\ +$(eval $(call gb_Library_use_libraries,sfx,\ objc \ Cocoa \ )) @@ -276,7 +276,7 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -UPRECOMPILED_HEADERS \ )) -$(eval $(call gb_Library_add_linked_libs,sfx,\ +$(eval $(call gb_Library_use_libraries,sfx,\ gdi32 \ advapi32 \ ole32 \ |