diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
| commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
| tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 | |
| parent | a16060116346533923c607bd406d3fea511b41ec (diff) | |
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)
531 files changed, 1426 insertions, 1177 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index cbd016bfb960..c40343d69330 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_Library,merged)) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ basegfx \ comphelper \ cppu \ @@ -58,12 +58,12 @@ $(eval $(call gb_Library_use_externals,merged,\ endif # gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk -$(eval $(call gb_Library_add_library_objects,merged,\ +$(eval $(call gb_Library_use_library_objects,merged,\ $(gb_MERGEDLIBS) \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ advapi32 \ gdi32 \ ole32 \ @@ -76,14 +76,14 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ endif ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ objc \ Cocoa \ )) endif ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_linked_libs,merged,\ +$(eval $(call gb_Library_use_libraries,merged,\ objc \ Cocoa \ )) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a11f312684e6..d2b14384c9a4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -43,7 +43,7 @@ gb_LinkTarget__use_Mesa:= else define gb_LinkTarget__use_Mesa -$(eval $(call gb_LinkTarget_add_external_headers,$(1),Mesa_inc)) +$(eval $(call gb_LinkTarget_use_package,$(1),Mesa_inc)) endef endif @@ -69,7 +69,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ )) define gb_LinkTarget__use_cppunit -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ cppunit \ ) @@ -94,7 +94,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_zlib -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ zlib \ ) @@ -125,7 +125,7 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/external/jpeg \ ) -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ jpeglib \ ) @@ -163,7 +163,7 @@ $(if $(filter-out ascii_expat_xmlparse,$(2)),\ -DXML_UNICODE \ )) -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ $(2) \ expat_xmltok \ ) @@ -209,7 +209,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(OUTDIR)/inc/hunspell \ ) -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \ ) @@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_cmis -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ cmislib \ ) @@ -270,11 +270,11 @@ endif define gb_LinkTarget__use_libexttextcat ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ libexttextcat \ ) else -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ exttextcat \ ) endif @@ -305,7 +305,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ )) define gb_LinkTarget__use_libxml2 -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ xml2 \ ) @@ -332,7 +332,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_libxslt -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ xslt \ ) @@ -373,7 +373,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ neon \ ) @@ -403,7 +403,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_librdf -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ rdf \ ) @@ -448,7 +448,7 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/cairo \ $(FREETYPE_CFLAGS) \ ) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ cairo \ ) ifneq ($(OS),WNT) @@ -457,7 +457,7 @@ $(call gb_LinkTarget_add_static_libs,$(1),\ pixman-1 \ ) else -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ pixman-1 \ ) endif @@ -502,7 +502,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ graphite2_off \ )) define gb_LinkTarget__use_graphite -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ graphite2_off \ ) @@ -553,13 +553,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_icudt -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ icudt \ ) endef define gb_LinkTarget__use_icuin -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ icuin \ ) @@ -574,13 +574,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_icudata -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ icudata$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icui18n -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ icui18n$(gb_ICU_suffix) \ ) @@ -588,19 +588,19 @@ endef endif define gb_LinkTarget__use_icule -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ icule$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icutu -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ icutu$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icuuc -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ icuuc$(gb_ICU_suffix) \ ) @@ -636,17 +636,17 @@ endif define gb_LinkTarget__use_openssl ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ crypto \ ssl \ ) else -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ crypto \ ssl \ ) ifeq ($(OS),SOLARIS) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ nsl \ socket \ ) @@ -676,7 +676,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_cdr -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ cdrlib \ ) @@ -703,7 +703,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_visio -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ visiolib \ ) @@ -730,7 +730,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wpd -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ wpdlib \ ) @@ -757,7 +757,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wpg -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ wpglib \ ) @@ -784,7 +784,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wps -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ wpslib \ ) @@ -811,7 +811,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_lcms2 -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ lcms2 \ ) @@ -834,7 +834,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_lpsolve55 -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ lpsolve55 \ ) @@ -951,11 +951,11 @@ endif define gb_LinkTarget__use_berkeleydb ifneq ($(OS),WNT) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ db-4.7 \ ) else -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ db47 \ ) endif @@ -985,7 +985,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ )) define gb_LinkTarget__use_png -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ png \ ) @@ -1012,7 +1012,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ curl \ ) @@ -1098,18 +1098,18 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_linked_static_libs,$(1),\ +$(call gb_LinkTarget_use_static_libraries,$(1),\ fofi \ Goo \ xpdf \ ) ifeq ($(OS),MACOSX) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ objc \ ) else ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ advapi32 \ gdi32 \ ) @@ -1141,7 +1141,7 @@ endef else # !SYSTEM_CLUCENE define gb_LinkTarget__use_clucene -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ clucene \ ) @@ -1253,7 +1253,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ )) define gb_LinkTarget__use_plc4 -$(call gb_LinkTarget_add_linked_libs,$(1),\ +$(call gb_LinkTarget_use_libraries,$(1),\ plc4 \ ) @@ -1266,13 +1266,13 @@ endif ifeq ($(SYSTEM_SAXON),YES) define gb_JavaClassSet__use_saxon -$(call gb_JavaClassSet_add_system_jar,$(1),$(SAXON_JAR)) +$(call gb_JavaClassSet_use_system_jar,$(1),$(SAXON_JAR)) endef else # !SYSTEM_SAXON define gb_JavaClassSet__use_saxon -$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/saxon9.jar) +$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar) endef endif # SYSTEM_SAXON @@ -1280,13 +1280,13 @@ endif # SYSTEM_SAXON ifeq ($(SYSTEM_BSH),YES) define gb_JavaClassSet__use_bsh -$(call gb_JavaClassSet_add_system_jar,$(1),$(BSH_JAR)) +$(call gb_JavaClassSet_use_system_jar,$(1),$(BSH_JAR)) endef else # !SYSTEM_BSH define gb_JavaClassSet__use_bsh -$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/bsh.jar) +$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/bsh.jar) endef endif # SYSTEM_BSH diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk index f1eb96af2474..9e7fc16f6d70 100644 --- a/UnoControls/Library_ctl.mk +++ b/UnoControls/Library_ctl.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,ctl,\ -I$(SRCDIR)/UnoControls/source/inc \ )) -$(eval $(call gb_Library_add_api,ctl,\ +$(eval $(call gb_Library_use_api,ctl,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ctl,\ +$(eval $(call gb_Library_use_libraries,ctl,\ cppu \ cppuhelper \ sal \ diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk index 49f77a038264..1d82c5f1bfc8 100644 --- a/accessibility/Jar_accessibility.mk +++ b/accessibility/Jar_accessibility.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,java_accessibility)) -$(eval $(call gb_Jar_add_jars,java_accessibility,\ +$(eval $(call gb_Jar_use_jars,java_accessibility,\ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk index 919e428a5746..586f775f3870 100644 --- a/accessibility/Jar_uno_accessbridge.mk +++ b/accessibility/Jar_uno_accessbridge.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,java_uno_accessbridge)) -$(eval $(call gb_Jar_add_jars,java_uno_accessbridge,\ +$(eval $(call gb_Jar_use_jars,java_uno_accessbridge,\ $(OUTDIR)/bin/java_accessibility.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index 6fb65b6dc84e..af15243a53bc 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,acc,\ -I$(SRCDIR)/accessibility/source/inc \ )) -$(eval $(call gb_Library_add_api,acc,\ +$(eval $(call gb_Library_use_api,acc,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,acc,\ +$(eval $(call gb_Library_use_libraries,acc,\ comphelper \ cppu \ cppuhelper \ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index e03dd432010a..dcf0acc0eddc 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -27,14 +27,14 @@ $(eval $(call gb_Library_Library,java_uno_accessbridge)) -$(eval $(call gb_Library_add_custom_headers,java_uno_accessbridge,accessibility/bridge/inc)) +$(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc)) -$(eval $(call gb_Library_add_api,java_uno_accessbridge,\ +$(eval $(call gb_Library_use_api,java_uno_accessbridge,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,java_uno_accessbridge,\ +$(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ cppu \ jvmaccess \ sal \ diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 03e30d9210cb..fbd4ae9bfadf 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_add_package_headers,animcore,animations_inc)) $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore)) -$(eval $(call gb_Library_add_api,animcore,\ +$(eval $(call gb_Library_use_api,animcore,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,animcore,\ +$(eval $(call gb_Library_use_libraries,animcore,\ cppu \ cppuhelper \ sal \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index f65447825344..1565af5f4dbf 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,avmedia,\ -I$(SRCDIR)/avmedia/source/inc \ )) -$(eval $(call gb_Library_add_api,avmedia,\ +$(eval $(call gb_Library_use_api,avmedia,\ udkapi \ offapi \ )) @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,avmedia,\ -DAVMEDIA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,avmedia,\ +$(eval $(call gb_Library_use_libraries,avmedia,\ comphelper \ ucbhelper \ cppu \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index 06e5712dbafb..d471c0321c8e 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\ -I$(SRCDIR)/avmedia/source/inc \ )) -$(eval $(call gb_Library_add_api,avmediaQuickTime,\ +$(eval $(call gb_Library_use_api,avmediaQuickTime,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,avmediaQuickTime,\ +$(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ comphelper \ cppu \ cppuhelper \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 827ab4fdbaf8..b6323bbb2f42 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,avmediagst,\ $(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \ )) -$(eval $(call gb_Library_add_api,avmediagst,\ +$(eval $(call gb_Library_use_api,avmediagst,\ udkapi \ offapi \ )) @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,avmediagst,\ )) endif -$(eval $(call gb_Library_add_linked_libs,avmediagst,\ +$(eval $(call gb_Library_use_libraries,avmediagst,\ comphelper \ cppu \ cppuhelper \ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 1215a3219f17..bac516197839 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,avmediawin,\ -I$(SRCDIR)/avmedia/source/inc \ )) -$(eval $(call gb_Library_add_api,avmediawin,\ +$(eval $(call gb_Library_use_api,avmediawin,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,avmediawin,\ +$(eval $(call gb_Library_use_libraries,avmediawin,\ comphelper \ cppu \ cppuhelper \ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index cfc44884d069..897600b30e69 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,basctl,\ -I$(WORKDIR)/SdiTarget/basctl/sdi \ )) -$(eval $(call gb_Library_add_api,basctl,\ +$(eval $(call gb_Library_use_api,basctl,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,basctl,\ +$(eval $(call gb_Library_use_libraries,basctl,\ comphelper \ cppu \ cppuhelper \ @@ -124,7 +124,7 @@ $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,basctl,\ +$(eval $(call gb_Library_use_libraries,basctl,\ advapi32 \ gdi32 \ shell32 \ diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index 3604ed490bff..e1e7f301756a 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \ basebmp/test/tools \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \ +$(eval $(call gb_CppunitTest_use_libraries,basebmp_test, \ basebmp \ basegfx \ sal \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 93c58c17842e..731d965ad982 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,basebmp,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,basebmp,\ +$(eval $(call gb_Library_use_api,basebmp,\ offapi \ udkapi \ )) @@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,basebmp,\ -DBASEBMP_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,basebmp,\ +$(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ sal \ $(gb_STDLIBS) \ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 3acabef12209..7874fa40267d 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \ basegfx/test/genericclipper \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \ +$(eval $(call gb_CppunitTest_use_libraries,basegfx_test, \ basegfx \ cppu \ cppuhelper \ @@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_api,basegfx_test,\ +$(eval $(call gb_CppunitTest_use_api,basegfx_test,\ offapi \ udkapi \ )) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 422309542fa5..4e88a3e1ad10 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -51,12 +51,12 @@ $(eval $(call gb_Library_add_cxxflags,basegfx,\ endif endif -$(eval $(call gb_Library_add_api,basegfx,\ +$(eval $(call gb_Library_use_api,basegfx,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,basegfx,\ +$(eval $(call gb_Library_use_libraries,basegfx,\ cppu \ cppuhelper \ sal \ diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 2102ccb40c0b..70c5a07b6bd3 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -47,7 +47,7 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,basegfx_s,\ endif endif -$(eval $(call gb_StaticLibrary_add_api,basegfx_s,\ +$(eval $(call gb_StaticLibrary_use_api,basegfx_s,\ offapi \ udkapi \ )) diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk index e7849e2e8d8e..21e1a826c73e 100644 --- a/basic/CppunitTest_basic_scanner.mk +++ b/basic/CppunitTest_basic_scanner.mk @@ -4,10 +4,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basic_scanner, \ basic/qa/cppunit/test_scanner \ )) -$(eval $(call gb_CppunitTest_add_library_objects,basic_scanner,sb)) +$(eval $(call gb_CppunitTest_use_library_objects,basic_scanner,sb)) # add a list of all needed libraries here -$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \ +$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ comphelper \ cppu \ cppuhelper \ @@ -25,7 +25,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \ )) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \ +$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \ oleaut32 \ )) endif diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index fbc4e79798dc..91c0b39c9ad5 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,sb,\ -I$(SRCDIR)/basic/source/inc \ )) -$(eval $(call gb_Library_add_api,sb,\ +$(eval $(call gb_Library_use_api,sb,\ udkapi \ offapi \ oovbaapi \ @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,sb,\ -DBASIC_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,sb,\ +$(eval $(call gb_Library_use_libraries,sb,\ comphelper \ cppu \ cppuhelper \ @@ -145,12 +145,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ )) # Uncomment the following line if DBG_TRACE_PROFILING is active in source/inc/sbtrace.hxx -# $(eval $(call gb_Library_add_linked_libs,sb,\ +# $(eval $(call gb_Library_use_libraries,sb,\ canvastools \ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,sb,\ +$(eval $(call gb_Library_use_libraries,sb,\ uwinapi \ oleaut32 \ )) diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk index 1d03e5cf4cb6..1b897a6d3bef 100644 --- a/bean/Jar_officebean.mk +++ b/bean/Jar_officebean.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Jar_Jar,officebean)) -$(eval $(call gb_Jar_add_jars,officebean,\ +$(eval $(call gb_Jar_use_jars,officebean,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk index f443d39fe1a4..5eec323a3472 100644 --- a/bean/JunitTest_bean_complex.mk +++ b/bean/JunitTest_bean_complex.mk @@ -29,7 +29,7 @@ $(eval $(call gb_JunitTest_JunitTest,bean_complex)) -$(eval $(call gb_JunitTest_add_jars,bean_complex,\ +$(eval $(call gb_JunitTest_use_jars,bean_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index bef4ac271d21..8cafec328542 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -46,7 +46,7 @@ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,officebean,\ +$(eval $(call gb_Library_use_libraries,officebean,\ jawt \ )) @@ -63,7 +63,7 @@ $(eval $(call gb_Library_add_ldflags,officebean,\ endif -$(eval $(call gb_Library_add_linked_libs,officebean,\ +$(eval $(call gb_Library_use_libraries,officebean,\ $(gb_STDLIBS) \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index b78a9b418925..8e7a441d5614 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -28,7 +28,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) -$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-cache,\ +$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ $(gb_STDLIBS) \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 4b6cc3cfff13..57036ed59c82 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -28,7 +28,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal)) -$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\ +$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ cppu \ cppuhelper \ sal \ @@ -36,11 +36,11 @@ $(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_library_objects,binaryurp_test-unmarshal,\ +$(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\ binaryurp \ )) -$(eval $(call gb_CppunitTest_add_api,binaryurp_test-unmarshal,\ +$(eval $(call gb_CppunitTest_use_api,binaryurp_test-unmarshal,\ udkapi \ )) diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index c86febe3be20..f0b51739d934 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,binaryurp)) $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp)) -$(eval $(call gb_Library_add_api,binaryurp,\ +$(eval $(call gb_Library_use_api,binaryurp,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,binaryurp,\ +$(eval $(call gb_Library_use_libraries,binaryurp,\ cppu \ cppuhelper \ sal \ diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 8e4f43d7623b..d7d09e62c57f 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,cairocanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,cairocanvas,\ +$(eval $(call gb_Library_use_api,cairocanvas,\ offapi \ udkapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_cxxflags,cairocanvas,\ endif -$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ +$(eval $(call gb_Library_use_libraries,cairocanvas,\ sal \ cppu \ basegfx \ @@ -99,7 +99,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_win32_cairo \ )) -$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ +$(eval $(call gb_Library_use_libraries,cairocanvas,\ gdi32 \ )) @@ -115,7 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ )) # freetype? fontconfig? -> test on Solaris -$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ +$(eval $(call gb_Library_use_libraries,cairocanvas,\ X11 \ Xrender \ )) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index bdd5a7ef6cbc..cbdb02ce81a1 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_include,canvasfactory,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,canvasfactory,\ +$(eval $(call gb_Library_use_api,canvasfactory,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,canvasfactory,\ +$(eval $(call gb_Library_use_libraries,canvasfactory,\ cppu \ cppuhelper \ sal \ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 5d121f5136d9..4ab7ab86e885 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,canvastools,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,canvastools,\ +$(eval $(call gb_Library_use_api,canvastools,\ offapi \ udkapi \ )) @@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,canvastools,\ -DCANVASTOOLS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,canvastools,\ +$(eval $(call gb_Library_use_libraries,canvastools,\ basegfx \ comphelper \ cppu \ @@ -77,7 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/bitmap \ canvas/source/tools/image \ )) -$(eval $(call gb_Library_add_linked_libs,canvastools,\ +$(eval $(call gb_Library_use_libraries,canvastools,\ agg \ )) ifneq ($(strip $(AGG_VERSION)),) @@ -88,7 +88,7 @@ endif endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,canvastools,\ +$(eval $(call gb_Library_use_libraries,canvastools,\ winmm \ )) endif diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 0b1da59e8770..ab9ec64a59d4 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,directx9canvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,directx9canvas,\ +$(eval $(call gb_Library_use_api,directx9canvas,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\ -UNOMINMAX \ )) -$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ +$(eval $(call gb_Library_use_libraries,directx9canvas,\ cppu \ tk \ sal \ @@ -61,13 +61,13 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ +$(eval $(call gb_Library_use_libraries,directx9canvas,\ d3d9 \ gdi32 \ gdiplus \ )) -$(eval $(call gb_Library_add_linked_static_libs,directx9canvas,\ +$(eval $(call gb_Library_use_static_libraries,directx9canvas,\ directxcanvas \ )) diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 3be70e5848cb..f3ddcb8ddf3f 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,gdipluscanvas,\ +$(eval $(call gb_Library_use_api,gdipluscanvas,\ offapi \ udkapi \ )) @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\ )) endif -$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ +$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ cppu \ tk \ sal \ @@ -67,12 +67,12 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\ +$(eval $(call gb_Library_use_libraries,gdipluscanvas,\ gdi32 \ gdiplus \ )) -$(eval $(call gb_Library_add_linked_static_libs,gdipluscanvas,\ +$(eval $(call gb_Library_use_static_libraries,gdipluscanvas,\ directxcanvas \ )) diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index 24050ff43abb..42260bf4aa11 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,nullcanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,nullcanvas,\ +$(eval $(call gb_Library_use_api,nullcanvas,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,nullcanvas,\ +$(eval $(call gb_Library_use_libraries,nullcanvas,\ basegfx \ canvastools \ comphelper \ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index fb70e90bc21e..a76bfafb6013 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,simplecanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,simplecanvas,\ +$(eval $(call gb_Library_use_api,simplecanvas,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,simplecanvas,\ +$(eval $(call gb_Library_use_libraries,simplecanvas,\ basegfx \ canvastools \ comphelper \ diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 344f8da5490b..43cdc961877a 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,vclcanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_Library_add_api,vclcanvas,\ +$(eval $(call gb_Library_use_api,vclcanvas,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,vclcanvas,\ +$(eval $(call gb_Library_use_libraries,vclcanvas,\ basegfx \ canvastools \ comphelper \ diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index c4ff2b633b1b..232429cb7c4a 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -32,7 +32,7 @@ $(eval $(call gb_StaticLibrary_set_include,directxcanvas,\ -I$(SRCDIR)/canvas/inc \ )) -$(eval $(call gb_StaticLibrary_add_api,directxcanvas,\ +$(eval $(call gb_StaticLibrary_use_api,directxcanvas,\ offapi \ udkapi \ )) diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk index ad0315aaed81..575c51f6d831 100644 --- a/chart2/JunitTest_chart2_unoapi.mk +++ b/chart2/JunitTest_chart2_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/chart2/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,chart2_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,chart2_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index d3b0f15769f5..ea0b2c28301c 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartcontroller,\ -I$(SRCDIR)/chart2/source/inc \ )) -$(eval $(call gb_Library_add_api,chartcontroller,\ +$(eval $(call gb_Library_use_api,chartcontroller,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartcontroller,\ # CFLAGS+=-ftemplate-depth-128 # .ENDIF -$(eval $(call gb_Library_add_linked_libs,chartcontroller,\ +$(eval $(call gb_Library_use_libraries,chartcontroller,\ basegfx \ charttools \ chartview \ diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk index c1de660620f5..c1da053d8485 100644 --- a/chart2/Library_chartmodel.mk +++ b/chart2/Library_chartmodel.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartmodel,\ -I$(SRCDIR)/chart2/source/inc \ )) -$(eval $(call gb_Library_add_api,chartmodel,\ +$(eval $(call gb_Library_use_api,chartmodel,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartmodel,\ # CFLAGS+=-ftemplate-depth-128 # .ENDIF -$(eval $(call gb_Library_add_linked_libs,chartmodel,\ +$(eval $(call gb_Library_use_libraries,chartmodel,\ charttools \ comphelper \ cppu \ diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk index 7b2de1ee1b0f..0c55770f306e 100644 --- a/chart2/Library_charttools.mk +++ b/chart2/Library_charttools.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Library_add_defs,charttools,\ -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \ )) -$(eval $(call gb_Library_add_api,charttools,\ +$(eval $(call gb_Library_use_api,charttools,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,charttools,\ +$(eval $(call gb_Library_use_libraries,charttools,\ basegfx \ comphelper \ cppu \ diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk index 974df61b1401..ab3952e1d7af 100644 --- a/chart2/Library_chartview.mk +++ b/chart2/Library_chartview.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,chartview,\ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ )) -$(eval $(call gb_Library_add_api,chartview,\ +$(eval $(call gb_Library_use_api,chartview,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,chartview,\ +$(eval $(call gb_Library_use_libraries,chartview,\ basegfx \ charttools \ comphelper \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index 2cc9520a9175..eac57155d83a 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -49,12 +49,12 @@ $(eval $(call gb_Library_add_defs,clucene,\ )) # clucene does not depend on sal nor needs uwinapi here -$(eval $(call gb_Library_add_linked_libs,clucene,\ +$(eval $(call gb_Library_use_libraries,clucene,\ $(filter-out uwinapi,$(gb_STDLIBS)) \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,clucene,\ +$(eval $(call gb_Library_use_libraries,clucene,\ dl \ m \ pthread \ diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index b36ba1d07006..942539ba6b5d 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -31,12 +31,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \ comphelper/qa/string/test_string \ )) -$(eval $(call gb_CppunitTest_add_api,comphelper_test, \ +$(eval $(call gb_CppunitTest_use_api,comphelper_test, \ udkapi \ offapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,comphelper_test, \ +$(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ comphelper \ cppuhelper \ cppu \ diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk index 090ed605a3e2..78c26a4e9648 100644 --- a/comphelper/JunitTest_comphelper_complex.mk +++ b/comphelper/JunitTest_comphelper_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\ comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \ )) -$(eval $(call gb_JunitTest_add_jars,comphelper_complex,\ +$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 05ae0abdacfc..7627a9c5016e 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,comphelper,\ -DCOMPHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,comphelper,\ +$(eval $(call gb_Library_use_libraries,comphelper,\ cppu \ cppuhelper \ sal \ @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_api,comphelper,\ +$(eval $(call gb_Library_use_api,comphelper,\ udkapi \ offapi \ )) diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk index e1abbb331cab..70b570ca60fb 100644 --- a/configmgr/JunitTest_configmgr_unoapi.mk +++ b/configmgr/JunitTest_configmgr_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/configmgr/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,configmgr_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,configmgr_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 2210871bd9a4..13cbdd854165 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -63,12 +63,12 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \ configmgr/source/xmldata \ )) -$(eval $(call gb_Library_add_api,configmgr, \ +$(eval $(call gb_Library_use_api,configmgr, \ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,configmgr, \ +$(eval $(call gb_Library_use_libraries,configmgr, \ comphelper \ cppu \ cppuhelper \ diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index 8e647601cab5..ce2355b79a8b 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,cppcanvas,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,cppcanvas,\ +$(eval $(call gb_Library_use_api,cppcanvas,\ offapi \ udkapi \ )) @@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\ -DCPPCANVAS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,cppcanvas,\ +$(eval $(call gb_Library_use_libraries,cppcanvas,\ basegfx \ canvastools \ comphelper \ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index 52e2387ccdc5..f49134463ead 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,mtfrenderer)) $(eval $(call gb_Library_set_componentfile,mtfrenderer,cppcanvas/source/uno/mtfrenderer)) -$(eval $(call gb_Library_add_linked_libs,mtfrenderer,\ +$(eval $(call gb_Library_use_libraries,mtfrenderer,\ sal \ cppu \ cppuhelper \ @@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,mtfrenderer,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_api,mtfrenderer,\ +$(eval $(call gb_Library_use_api,mtfrenderer,\ offapi \ udkapi \ )) diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 28993ee5c584..6263e7dae0c6 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \ cppu/qa/test_any \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_any, \ +$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ $(gb_STDLIBS) \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index 7bf9868b50b4..1534e382ea37 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \ cppu/qa/test_recursion \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_recursion, \ +$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ cppu \ sal \ $(gb_STDLIBS) \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index 279cce7e0848..1dc96fe813fe 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \ cppu/qa/test_reference \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_reference, \ +$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ $(gb_STDLIBS) \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index 0a17bc220509..bb1ac9155800 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \ cppu/qa/test_unotype \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_unotype, \ +$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ cppu \ sal \ $(gb_STDLIBS) \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 6ed2e7be97a1..0c495c03a01c 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \ cppu/qa/cppumaker/test_cppumaker \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppu_test_cppumaker, \ +$(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ $(gb_STDLIBS) \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index fd04b536d220..33182712e4a1 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,affine_uno,\ -I$(SRCDIR)/cppu/inc \ )) -$(eval $(call gb_Library_add_api,affine_uno,\ +$(eval $(call gb_Library_use_api,affine_uno,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,affine_uno,\ +$(eval $(call gb_Library_use_libraries,affine_uno,\ purpenvhelper \ sal \ $(gb_STDLIBS) \ diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 4febd330daeb..d1b527b24310 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,cppu,\ -I$(SRCDIR)/cppu/inc \ )) -$(eval $(call gb_Library_add_api,cppu,\ +$(eval $(call gb_Library_use_api,cppu,\ udkapi \ offapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,cppu,\ -DCPPU_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,cppu,\ +$(eval $(call gb_Library_use_libraries,cppu,\ sal \ $(gb_STDLIBS) \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index b07a766ea01d..582414d381d1 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,log_uno,\ -I$(SRCDIR)/cppu/inc \ )) -$(eval $(call gb_Library_add_api,log_uno,\ +$(eval $(call gb_Library_use_api,log_uno,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,log_uno,\ +$(eval $(call gb_Library_use_libraries,log_uno,\ cppu \ purpenvhelper \ sal \ diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 5bac8e5bcd67..60d04850a270 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -38,12 +38,12 @@ $(eval $(call gb_Library_add_defs,purpenvhelper,\ -DPURPENV_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,purpenvhelper,\ +$(eval $(call gb_Library_use_api,purpenvhelper,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,purpenvhelper,\ +$(eval $(call gb_Library_use_libraries,purpenvhelper,\ cppu \ sal \ $(gb_STDLIBS) \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index 26d9a68e7c1d..49724f5377dd 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,unsafe_uno,\ -I$(SRCDIR)/cppu/inc \ )) -$(eval $(call gb_Library_add_api,unsafe_uno,\ +$(eval $(call gb_Library_use_api,unsafe_uno,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,unsafe_uno,\ +$(eval $(call gb_Library_use_libraries,unsafe_uno,\ purpenvhelper \ sal \ $(gb_STDLIBS) \ diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 2006d98d63ec..3432a83797d8 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_ifcontainer,\ cppuhelper/qa/ifcontainer/cppu_ifcontainer \ )) -$(eval $(call gb_CppunitTest_add_api,cppuhelper_cppu_ifcontainer,\ +$(eval $(call gb_CppunitTest_use_api,cppuhelper_cppu_ifcontainer,\ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_ifcontainer,\ +$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppu \ cppuhelper \ sal \ diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index ceaec25f5cce..658afbcc0b56 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_unourl,\ cppuhelper/qa/unourl/cppu_unourl \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_unourl,\ +$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppu \ cppuhelper \ sal \ diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index eaea97b201a4..455ea6d9ee20 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_qa_weak,\ cppuhelper/qa/weak/test_weak \ )) -$(eval $(call gb_CppunitTest_add_api,cppuhelper_qa_weak,\ +$(eval $(call gb_CppunitTest_use_api,cppuhelper_qa_weak,\ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_qa_weak,\ +$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppu \ cppuhelper \ sal \ diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 2fa6d1aa9a5b..3724459fc97a 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,cppuhelper,\ -DCPPUHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,cppuhelper,\ +$(eval $(call gb_Library_use_libraries,cppuhelper,\ cppu \ sal \ salhelper \ diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 6df0d5bbaa00..125130650cb8 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_defs,cui,\ $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \ )) -$(eval $(call gb_Library_add_api,cui,\ +$(eval $(call gb_Library_use_api,cui,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,cui,\ +$(eval $(call gb_Library_use_libraries,cui,\ avmedia \ basegfx \ comphelper \ @@ -78,7 +78,7 @@ $(eval $(call gb_Library_use_externals,cui,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,cui,\ +$(eval $(call gb_Library_use_libraries,cui,\ advapi32 \ shlwapi \ )) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index de72fdf41493..95129467341c 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_macros_test, \ dbaccess/qa/extras/macros-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,dbaccess_macros_test, \ +$(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ avmedia \ basegfx \ comphelper \ @@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\ +$(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ offapi \ oovbaapi \ udkapi \ @@ -85,12 +85,12 @@ $(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\ $(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,dbaccess_macros_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,dbaccess_macros_test,\ oovbaapi \ types \ )) -$(eval $(call gb_CppunitTest_add_components,dbaccess_macros_test,\ +$(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 60017df403a9..b81dc7376c62 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\ -I$(SRCDIR)/dbaccess/inc \ )) -$(eval $(call gb_Library_add_api,odbcconfig,\ +$(eval $(call gb_Library_use_api,odbcconfig,\ offapi \ udkapi \ )) -$(eval $(call gb_Executable_add_linked_libs,odbcconfig,\ +$(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_STDLIBS) \ )) diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk index 8606bfe4b03f..ad393949b376 100644 --- a/dbaccess/JunitTest_dbaccess_complex.mk +++ b/dbaccess/JunitTest_dbaccess_complex.mk @@ -54,7 +54,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\ dbaccess/qa/complex/dbaccess/TestCase \ )) -$(eval $(call gb_JunitTest_add_jars,dbaccess_complex,\ +$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk index d99951848125..369b66f75a30 100644 --- a/dbaccess/JunitTest_dbaccess_unoapi.mk +++ b/dbaccess/JunitTest_dbaccess_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,dbaccess_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,dbaccess_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 34100ce03c60..ee7489d30a47 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,dba,\ -DOOO_DLLIMPLEMENTATION_DBA \ )) -$(eval $(call gb_Library_add_api,dba,\ +$(eval $(call gb_Library_use_api,dba,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,dba,\ +$(eval $(call gb_Library_use_libraries,dba,\ comphelper \ cppu \ cppuhelper \ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index ea248db20723..093a2eb19e2d 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,dbaxml,\ -I$(SRCDIR)/dbaccess/source/inc \ )) -$(eval $(call gb_Library_add_api,dbaxml,\ +$(eval $(call gb_Library_use_api,dbaxml,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,dbaxml,\ +$(eval $(call gb_Library_use_libraries,dbaxml,\ comphelper \ cppu \ cppuhelper \ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index ae690b2a23b9..82782079aee8 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,dbmm,\ -I$(SRCDIR)/dbaccess/inc \ )) -$(eval $(call gb_Library_add_api,dbmm,\ +$(eval $(call gb_Library_use_api,dbmm,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,dbmm,\ +$(eval $(call gb_Library_use_libraries,dbmm,\ comphelper \ cppu \ cppuhelper \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 585ad94dfa94..727568e1704f 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbu,\ -I$(WORKDIR)/inc/dbaccess \ )) -$(eval $(call gb_Library_add_api,dbu,\ +$(eval $(call gb_Library_use_api,dbu,\ offapi \ udkapi \ )) @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_cxxflags,dbu,\ )) endif -$(eval $(call gb_Library_add_linked_libs,dbu,\ +$(eval $(call gb_Library_use_libraries,dbu,\ comphelper \ cppu \ cppuhelper \ @@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,dbu,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,dbu,\ +$(eval $(call gb_Library_use_libraries,dbu,\ ole32 \ oleaut32 \ uuid \ diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index 84fe364d14ee..a8f6aa2f15d0 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,dbui,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,dbui,\ +$(eval $(call gb_Library_use_api,dbui,\ offapi \ udkapi \ )) @@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_defs,dbui,\ -DDBACCESS_DLLIMPLEMENTATION\ )) -$(eval $(call gb_Library_add_linked_libs,dbui,\ +$(eval $(call gb_Library_use_libraries,dbui,\ comphelper \ cppuhelper \ cppu \ @@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_linked_libs,dbui,\ $(gb_STDLIBS) \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,dbui,\ +$(eval $(call gb_Library_use_libraries,dbui,\ ole32 \ oleaut32 \ uuid \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 7a13d56cf492..d5d82eaf5c91 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,sdbt,\ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ )) -$(eval $(call gb_Library_add_api,sdbt,\ +$(eval $(call gb_Library_use_api,sdbt,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdbt,\ +$(eval $(call gb_Library_use_libraries,sdbt,\ comphelper \ cppu \ cppuhelper \ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index d7f4d73f8926..96ed6f76cc60 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ $(LFS_CFLAGS) \ )) -$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\ +$(eval $(call gb_Executable_use_libraries,crashrep_com,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index f1801e6af4b3..e3a766f2dd27 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,officeloader,\ +$(eval $(call gb_Executable_use_libraries,officeloader,\ sal \ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 9273b84bc66c..b8919d5f4a8b 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,oosplash,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,oosplash,\ +$(eval $(call gb_Executable_use_libraries,oosplash,\ sal \ $(gb_STDLIBS) \ )) @@ -80,7 +80,7 @@ endif ifeq ($(OS),SOLARIS) -$(eval $(call gb_Executable_add_linked_libs,oosplash,\ +$(eval $(call gb_Executable_use_libraries,oosplash,\ -lsocket \ )) diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 7da506601cd9..b3fbde1eaaf1 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,quickstart,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,quickstart,\ +$(eval $(call gb_Executable_use_libraries,quickstart,\ comdlg32 \ gdi32 \ ole32 \ @@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,quickstart,\ ifeq ($(COM),GCC) -$(eval $(call gb_Executable_add_linked_libs,quickstart,\ +$(eval $(call gb_Executable_use_libraries,quickstart,\ uuid \ )) diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 098f8c2c287d..375cba33385f 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\ -DUNICODE \ )) -$(eval $(call gb_Executable_add_linked_libs,sbase,\ +$(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 290e8804d662..ce90099a532b 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\ -DUNICODE \ )) -$(eval $(call gb_Executable_add_linked_libs,scalc,\ +$(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 2e57495c2360..4642445173b4 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ -DUNICODE \ )) -$(eval $(call gb_Executable_add_linked_libs,sdraw,\ +$(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 926ad57febd8..c3026435e3f4 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\ -DUNICODE \ )) -$(eval $(call gb_Executable_add_linked_libs,simpress,\ +$(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index ed1b460c3991..4c7c4afb8232 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,smath,\ -DUNICODE \ )) -$(eval $(call gb_Executable_add_linked_libs,smath,\ +$(eval $(call gb_Executable_use_libraries,smath,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index e0c58912bc89..59b9f085548e 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(sofficebin),\ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\ +$(eval $(call gb_Executable_use_libraries,$(sofficebin),\ sal \ sofficeapp \ $(gb_STDLIBS) \ @@ -52,7 +52,7 @@ $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\ ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\ +$(eval $(call gb_Executable_use_static_libraries,$(sofficebin),\ ooopathutils \ winextendloaderenv \ )) diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 9ca4d3a0345c..18efbbdf8770 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -29,14 +29,14 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) -$(eval $(call gb_Executable_add_linked_libs,soffice,\ +$(eval $(call gb_Executable_use_libraries,soffice,\ advapi32 \ shell32 \ shlwapi \ $(gb_STDLIBS) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,soffice,\ +$(eval $(call gb_Executable_use_static_libraries,soffice,\ ooopathutils \ winextendloaderenv \ )) diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 858bc7a6a8e5..870cf7d6c86a 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\ -DUNICODE \ )) -$(eval $(call gb_Executable_add_linked_libs,sweb,\ +$(eval $(call gb_Executable_use_libraries,sweb,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index f1e0d65d6a6a..acd299b641ca 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\ -DUNICODE \ )) -$(eval $(call gb_Executable_add_linked_libs,swriter,\ +$(eval $(call gb_Executable_use_libraries,swriter,\ $(gb_STDLIBS) \ )) diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk index bdb634239530..40db3a0bbb6e 100644 --- a/desktop/Executable_unoinfo.mk +++ b/desktop/Executable_unoinfo.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,unoinfo,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,unoinfo,\ +$(eval $(call gb_Executable_use_static_libraries,unoinfo,\ ooopathutils \ )) diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index c635c2b22995..cf22afdbdd67 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(unopkgbin),\ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\ +$(eval $(call gb_Executable_use_libraries,$(unopkgbin),\ comphelper \ sal \ tl \ diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk index 74d957e97e14..27611eac7ca0 100644 --- a/desktop/Executable_unopkg.mk +++ b/desktop/Executable_unopkg.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Executable_Executable,unopkg)) $(eval $(call gb_Executable_set_targettype_gui,unopkg,YES)) -$(eval $(call gb_Executable_add_linked_static_libs,unopkg,\ +$(eval $(call gb_Executable_use_static_libraries,unopkg,\ ooopathutils \ winextendloaderenv \ )) diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index 7e455ef66edb..3314c2e14ab9 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,deployment,\ -I$(SRCDIR)/desktop/source/deployment/registry/inc \ )) -$(eval $(call gb_Library_add_api,deployment,\ +$(eval $(call gb_Library_use_api,deployment,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,deployment,\ +$(eval $(call gb_Library_use_libraries,deployment,\ comphelper \ cppu \ cppuhelper \ @@ -94,7 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) -$(eval $(call gb_Library_add_linked_libs,deployment,\ +$(eval $(call gb_Library_use_libraries,deployment,\ helplinker \ )) diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 959484804330..c27c07752ae2 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,deploymentgui,\ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Library_add_api,deploymentgui,\ +$(eval $(call gb_Library_use_api,deploymentgui,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,deploymentgui,\ +$(eval $(call gb_Library_use_libraries,deploymentgui,\ comphelper \ cppu \ cppuhelper \ @@ -61,7 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\ ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,deploymentgui,\ +$(eval $(call gb_Library_use_libraries,deploymentgui,\ ole32 \ )) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 33965b3bb478..c03017759228 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\ -I$(SRCDIR)/desktop/source/deployment/inc \ )) -$(eval $(call gb_Library_add_api,deploymentmisc,\ +$(eval $(call gb_Library_use_api,deploymentmisc,\ offapi \ udkapi \ )) @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,deploymentmisc,\ -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,deploymentmisc,\ +$(eval $(call gb_Library_use_libraries,deploymentmisc,\ comphelper \ cppu \ cppuhelper \ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 76b270743dd7..4c1d51d7fd68 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,migrationoo2,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,migrationoo2,\ +$(eval $(call gb_Library_use_api,migrationoo2,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,migrationoo2,\ +$(eval $(call gb_Library_use_libraries,migrationoo2,\ cppu \ cppuhelper \ i18nisolang1 \ diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index e315a8470dd4..9689749e50b4 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,migrationoo3,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,migrationoo3,\ +$(eval $(call gb_Library_use_api,migrationoo3,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,migrationoo3,\ +$(eval $(call gb_Library_use_libraries,migrationoo3,\ cppu \ cppuhelper \ sal \ diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index e556cb724d44..cb088c026b73 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,offacc,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,offacc,\ +$(eval $(call gb_Library_use_api,offacc,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,offacc,\ +$(eval $(call gb_Library_use_libraries,offacc,\ cppu \ cppuhelper \ sal \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 668f290f127c..34dcfc3d1e50 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ -I$(SRCDIR)/desktop/source/deployment/inc \ )) -$(eval $(call gb_Library_add_api,sofficeapp,\ +$(eval $(call gb_Library_use_api,sofficeapp,\ offapi \ udkapi \ )) @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\ $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \ )) -$(eval $(call gb_Library_add_linked_libs,sofficeapp,\ +$(eval $(call gb_Library_use_libraries,sofficeapp,\ comphelper \ cppu \ cppuhelper \ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index 69f96b22a5de..35529052813c 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,spl,\ -I$(SRCDIR)/desktop/inc \ )) -$(eval $(call gb_Library_add_api,spl,\ +$(eval $(call gb_Library_use_api,spl,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,spl,\ +$(eval $(call gb_Library_use_libraries,spl,\ comphelper \ cppu \ cppuhelper \ diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index 82b1ecc03ae7..9fd065cb2b44 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -27,12 +27,12 @@ $(eval $(call gb_Library_Library,spl_unx)) -$(eval $(call gb_Library_add_api,spl_unx,\ +$(eval $(call gb_Library_use_api,spl_unx,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,spl_unx,\ +$(eval $(call gb_Library_use_libraries,spl_unx,\ cppu \ cppuhelper \ sal \ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 04a08bd6074b..93ca09b87ff2 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,unopkgapp,\ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Library_add_api,unopkgapp,\ +$(eval $(call gb_Library_use_api,unopkgapp,\ offapi \ udkapi \ )) @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,unopkgapp,\ -DDESKTOP_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,unopkgapp,\ +$(eval $(call gb_Library_use_libraries,unopkgapp,\ comphelper \ cppu \ cppuhelper \ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index de99829209d1..ba17108db613 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,drawinglayer,\ -DDRAWINGLAYER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,drawinglayer,\ +$(eval $(call gb_Library_use_api,drawinglayer,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,drawinglayer,\ +$(eval $(call gb_Library_use_libraries,drawinglayer,\ avmedia \ basegfx \ canvastools \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk index 141d15b3a934..f567a7435793 100644 --- a/dtrans/Library_dnd.mk +++ b/dtrans/Library_dnd.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,dnd,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,dnd,\ +$(eval $(call gb_Library_use_api,dnd,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,dnd,\ +$(eval $(call gb_Library_use_libraries,dnd,\ advapi32 \ cppu \ cppuhelper \ @@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,dnd,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,dnd,\ +$(eval $(call gb_Library_use_static_libraries,dnd,\ dtobj \ )) diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk index ca7090718b39..a043b5849325 100644 --- a/dtrans/Library_dtrans.mk +++ b/dtrans/Library_dtrans.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,dtrans,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,dtrans,\ +$(eval $(call gb_Library_use_api,dtrans,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,dtrans,\ +$(eval $(call gb_Library_use_libraries,dtrans,\ cppu \ cppuhelper \ sal \ diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk index 706cbd02aa9e..97825315ba44 100644 --- a/dtrans/Library_ftransl.mk +++ b/dtrans/Library_ftransl.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,ftransl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,ftransl,\ +$(eval $(call gb_Library_use_api,ftransl,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,ftransl,\ +$(eval $(call gb_Library_use_libraries,ftransl,\ advapi32 \ cppu \ cppuhelper \ @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,ftransl,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,ftransl,\ +$(eval $(call gb_Library_use_static_libraries,ftransl,\ dtobj \ )) diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk index 717baa7d2100..4baffdcff580 100644 --- a/dtrans/Library_mcnttype.mk +++ b/dtrans/Library_mcnttype.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,mcnttype,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,mcnttype,\ +$(eval $(call gb_Library_use_api,mcnttype,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,mcnttype,\ +$(eval $(call gb_Library_use_libraries,mcnttype,\ cppu \ cppuhelper \ sal \ @@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_exception_objects,mcnttype,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,mcnttype,\ +$(eval $(call gb_Library_use_libraries,mcnttype,\ uwinapi \ )) endif diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk index 85076757126b..270bbc0dbf2c 100644 --- a/dtrans/Library_sysdtrans.mk +++ b/dtrans/Library_sysdtrans.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,sysdtrans,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,sysdtrans,\ +$(eval $(call gb_Library_use_api,sysdtrans,\ udkapi \ offapi \ )) @@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,sysdtrans,\ -DUNICODE \ )) -$(eval $(call gb_Library_add_linked_libs,sysdtrans,\ +$(eval $(call gb_Library_use_libraries,sysdtrans,\ advapi32 \ cppu \ cppuhelper \ @@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,sysdtrans,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,sysdtrans,\ +$(eval $(call gb_Library_use_static_libraries,sysdtrans,\ dtobj \ )) diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk index 8a6981491229..200edcb0e67f 100644 --- a/dtrans/StaticLibrary_dtobj.mk +++ b/dtrans/StaticLibrary_dtobj.mk @@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_set_include,dtobj,\ -I$(SRCDIR)/solenv/inc \ )) -$(eval $(call gb_StaticLibrary_add_api,dtobj,\ +$(eval $(call gb_StaticLibrary_use_api,dtobj,\ udkapi \ offapi \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 9edbdb09f6f9..368073ce0966 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,editeng_borderline, \ editeng/qa/items/borderline_test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,editeng_borderline, \ +$(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ xo \ basegfx \ editeng \ @@ -63,7 +63,7 @@ $(eval $(call gb_CppunitTest_set_include,editeng_borderline,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,editeng_borderline,\ +$(eval $(call gb_CppunitTest_use_api,editeng_borderline,\ offapi \ udkapi \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 62c43a239c57..3f649dfde0ce 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_defs,editeng,\ -DEDITENG_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,editeng,\ +$(eval $(call gb_Library_use_api,editeng,\ udkapi \ offapi \ )) @@ -132,7 +132,7 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\ # add libraries to be linked to editeng; again these names need to be given as # specified in Repository.mk -$(eval $(call gb_Library_add_linked_libs,editeng,\ +$(eval $(call gb_Library_use_libraries,editeng,\ xo \ basegfx \ lng \ diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index b820eb69b89c..307dac579ab2 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,embobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,embobj,\ +$(eval $(call gb_Library_use_api,embobj,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,embobj,\ +$(eval $(call gb_Library_use_libraries,embobj,\ comphelper \ cppu \ cppuhelper \ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 4889693e4c9a..8420480be077 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -40,12 +40,12 @@ $(eval $(call gb_Library_set_include,emboleobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,emboleobj,\ +$(eval $(call gb_Library_use_api,emboleobj,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,emboleobj,\ +$(eval $(call gb_Library_use_libraries,emboleobj,\ comphelper \ cppu \ cppuhelper \ @@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,emboleobj,\ ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,emboleobj,\ +$(eval $(call gb_Library_use_libraries,emboleobj,\ embobj \ gdi32 \ ole32 \ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 5eb2a516c5f5..4cc20c399d8c 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -39,12 +39,12 @@ $(eval $(call gb_Library_add_defs,emser,\ -UNOMINMAX \ )) -$(eval $(call gb_Library_add_api,emser,\ +$(eval $(call gb_Library_use_api,emser,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,emser,\ +$(eval $(call gb_Library_use_libraries,emser,\ cppu \ cppuhelper \ gdi32 \ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index 27d93de61d13..85ee9dac95c3 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_include,inprocserv,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,inprocserv,\ +$(eval $(call gb_Library_use_libraries,inprocserv,\ gdi32 \ ole32 \ uuid \ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 8a1ca73c90e6..bab924313dd9 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,evtatt)) $(eval $(call gb_Library_set_componentfile,evtatt,eventattacher/source/evtatt)) -$(eval $(call gb_Library_add_linked_libs,evtatt,\ +$(eval $(call gb_Library_use_libraries,evtatt,\ cppuhelper \ cppu \ sal \ @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_exception_objects,evtatt,\ eventattacher/source/eventattacher \ )) -$(eval $(call gb_Library_add_api,evtatt,\ +$(eval $(call gb_Library_use_api,evtatt,\ udkapi \ )) diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index ba0b7b9f8f85..265d9323d4b7 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,extensions_test_update, \ extensions/qa/update/test_update \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \ +$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ updchk \ cppu \ cppuhelper \ @@ -43,7 +43,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \ )) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ shell32 \ ole32 \ )) @@ -56,18 +56,18 @@ $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_CppunitTest_add_api,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_api,extensions_test_update,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,extensions_test_update)) -$(eval $(call gb_CppunitTest_add_type_rdbs,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,extensions_test_update,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_components,extensions_test_update,\ configmgr/source/configmgr \ extensions/source/update/feed/updatefeed \ ucb/source/core/ucb1 \ diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index c04e2ed19595..157842ec0e0f 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Executable_Executable,nsplugin)) -$(eval $(call gb_Executable_add_api,nsplugin,\ +$(eval $(call gb_Executable_use_api,nsplugin,\ offapi \ udkapi \ )) @@ -41,11 +41,11 @@ $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ extensions/source/nsplugin/source/so_main \ )) -$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\ +$(eval $(call gb_Executable_use_static_libraries,nsplugin,\ npsoenv \ )) -$(eval $(call gb_Executable_add_linked_libs,nsplugin,\ +$(eval $(call gb_Executable_use_libraries,nsplugin,\ cppu \ cppuhelper \ sal \ @@ -63,11 +63,11 @@ $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ extensions/source/nsplugin/source/nsp_windows \ )) -$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\ +$(eval $(call gb_Executable_use_static_libraries,nsplugin,\ ooopathutils \ )) -$(eval $(call gb_Executable_add_linked_libs,nsplugin,\ +$(eval $(call gb_Executable_use_libraries,nsplugin,\ ws2_32 \ shell32 \ ole32 \ diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 52081072f4e1..4fd84f0f8cc3 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin)) -$(eval $(call gb_Executable_add_external_headers,pluginapp.bin,np_sdk_inc)) +$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc)) $(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers)) @@ -39,7 +39,7 @@ $(eval $(call gb_Executable_set_include,pluginapp.bin,\ -I$(SRCDIR)/extensions/source/plugin/inc \ )) -$(eval $(call gb_Executable_add_api,pluginapp.bin,\ +$(eval $(call gb_Executable_use_api,pluginapp.bin,\ offapi \ udkapi \ )) @@ -49,11 +49,11 @@ $(eval $(call gb_Executable_add_exception_objects,pluginapp.bin,\ extensions/source/plugin/unx/npnapi \ )) -$(eval $(call gb_Executable_add_linked_static_libs,pluginapp.bin,\ +$(eval $(call gb_Executable_use_static_libraries,pluginapp.bin,\ plugcon \ )) -$(eval $(call gb_Executable_add_linked_libs,pluginapp.bin,\ +$(eval $(call gb_Executable_use_libraries,pluginapp.bin,\ sal \ )) diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index b751e077cab0..d327c0769c26 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_defs,abp,\ -DCOMPMOD_RESPREFIX=abp \ )) -$(eval $(call gb_Library_add_api,abp,\ +$(eval $(call gb_Library_use_api,abp,\ offapi \ udkapi \ )) @@ -72,7 +72,7 @@ $(eval $(call gb_Library_add_exception_objects,abp,\ extensions/source/abpilot/unodialogabp \ )) -$(eval $(call gb_Library_add_linked_libs,abp,\ +$(eval $(call gb_Library_use_libraries,abp,\ comphelper \ cppuhelper \ cppu \ diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index ef1d30435b46..e31a42984562 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,bib,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_Library_add_api,bib,\ +$(eval $(call gb_Library_use_api,bib,\ offapi \ udkapi \ )) @@ -57,7 +57,7 @@ $(eval $(call gb_Library_add_exception_objects,bib,\ extensions/source/bibliography/toolbar \ )) -$(eval $(call gb_Library_add_linked_libs,bib,\ +$(eval $(call gb_Library_use_libraries,bib,\ dbtools \ sot \ svt \ diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 8fb95f445b09..988464dd8d90 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,dbp,\ -DCOMPMOD_NAMESPACE=dbp \ )) -$(eval $(call gb_Library_add_api,dbp,\ +$(eval $(call gb_Library_use_api,dbp,\ offapi \ udkapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_exception_objects,dbp,\ extensions/source/dbpilots/wizardservices \ )) -$(eval $(call gb_Library_add_linked_libs,dbp,\ +$(eval $(call gb_Library_use_libraries,dbp,\ svt \ vcl \ tl \ diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 6f676196452c..37442a80b257 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,ldapbe2)) $(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2)) -$(eval $(call gb_Library_add_api,ldapbe2,\ +$(eval $(call gb_Library_use_api,ldapbe2,\ offapi \ udkapi \ )) @@ -64,7 +64,7 @@ $(eval $(call gb_Library_add_exception_objects,ldapbe2,\ extensions/source/config/ldap/ldapuserprofilebe \ )) -$(eval $(call gb_Library_add_linked_libs,ldapbe2,\ +$(eval $(call gb_Library_use_libraries,ldapbe2,\ cppuhelper \ cppu \ salhelper \ diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index ce821be0b41e..247deb3f467a 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,log)) $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) -$(eval $(call gb_Library_add_api,log,\ +$(eval $(call gb_Library_use_api,log,\ offapi \ udkapi \ )) @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_exception_objects,log,\ extensions/source/logging/plaintextformatter \ )) -$(eval $(call gb_Library_add_linked_libs,log,\ +$(eval $(call gb_Library_use_libraries,log,\ comphelper \ cppuhelper \ cppu \ diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 08e59c2304e4..7e8b400d6eb8 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,npsoplugin)) $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) -$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ +$(eval $(call gb_Library_use_static_libraries,npsoplugin,\ npsoenv \ nputils \ )) @@ -65,11 +65,11 @@ endif # GUI=UNX ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ +$(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ooopathutils \ )) -$(eval $(call gb_Library_add_linked_libs,npsoplugin,\ +$(eval $(call gb_Library_use_libraries,npsoplugin,\ ws2_32 \ shell32 \ ole32 \ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 106daf838c59..668e9167ea4d 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,oleautobridge)) $(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge)) -$(eval $(call gb_Library_add_api,oleautobridge,\ +$(eval $(call gb_Library_use_api,oleautobridge,\ udkapi \ offapi \ )) @@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,oleautobridge,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,oleautobridge,\ +$(eval $(call gb_Library_use_libraries,oleautobridge,\ cppuhelper \ cppu \ sal \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index 012b99a22251..697818e04718 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_defs,oleautobridge2,\ -DOWNGUID \ )) -$(eval $(call gb_Library_add_api,oleautobridge2,\ +$(eval $(call gb_Library_use_api,oleautobridge2,\ udkapi \ offapi \ )) @@ -45,7 +45,7 @@ $(eval $(call gb_Library_set_include,oleautobridge2,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,oleautobridge2,\ +$(eval $(call gb_Library_use_libraries,oleautobridge2,\ cppuhelper \ cppu \ sal \ diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 2a32152e6809..0221489e8540 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,pcr)) $(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr)) -$(eval $(call gb_Library_add_api,pcr,\ +$(eval $(call gb_Library_use_api,pcr,\ udkapi \ offapi \ )) @@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,pcr,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,pcr,\ +$(eval $(call gb_Library_use_libraries,pcr,\ svx \ svxcore \ editeng \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 5ec260bbcfec..cbcfc795e233 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,pl)) $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) -$(eval $(call gb_Library_add_external_headers,pl,np_sdk_inc)) +$(eval $(call gb_Library_use_package,pl,np_sdk_inc)) $(eval $(call gb_Library_use_external,pl,mozilla_headers)) @@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,pl,\ -I$(SRCDIR)/extensions/source/plugin/inc \ )) -$(eval $(call gb_Library_add_api,pl,\ +$(eval $(call gb_Library_use_api,pl,\ offapi \ udkapi \ )) @@ -66,7 +66,7 @@ $(eval $(call gb_Library_add_libs,pl,\ endif # OS=SOLARIS ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,pl,\ +$(eval $(call gb_Library_use_libraries,pl,\ version \ ole32 \ advapi32 \ @@ -109,7 +109,7 @@ $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/unx/unxmgr \ )) -$(eval $(call gb_Library_add_linked_static_libs,pl,\ +$(eval $(call gb_Library_use_static_libraries,pl,\ plugcon \ )) @@ -121,7 +121,7 @@ endif # GUIBASE=aqua endif # GUI=UNX -$(eval $(call gb_Library_add_linked_libs,pl,\ +$(eval $(call gb_Library_use_libraries,pl,\ tk \ vcl \ svl \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 1fc857aa798f..2e03681243ef 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_Library,res)) $(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res)) -$(eval $(call gb_Library_add_api,res,\ +$(eval $(call gb_Library_use_api,res,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,res,\ +$(eval $(call gb_Library_use_libraries,res,\ vcl \ tl \ comphelper \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index fa49f7948785..c19819fb7e07 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,scn)) $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) -$(eval $(call gb_Library_add_api,scn,\ +$(eval $(call gb_Library_use_api,scn,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,scn,\ +$(eval $(call gb_Library_use_libraries,scn,\ svt \ vcl \ tl \ @@ -64,7 +64,7 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scanunx \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,scn,\ +$(eval $(call gb_Library_use_libraries,scn,\ dl \ )) endif diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 798fc0fe22d5..44bbf3ef3690 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -30,14 +30,14 @@ $(eval $(call gb_Library_Library,so_activex)) -$(eval $(call gb_Library_add_custom_headers,so_activex,extensions/source/activex/idl)) +$(eval $(call gb_Library_use_custom_headers,so_activex,extensions/source/activex/idl)) $(eval $(call gb_Library_set_include,so_activex,\ $$(INCLUDE) \ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) -$(eval $(call gb_Library_add_api,so_activex,\ +$(eval $(call gb_Library_use_api,so_activex,\ offapi \ udkapi \ )) @@ -57,7 +57,7 @@ $(eval $(call gb_Library_add_ldflags,so_activex,\ /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \ )) -$(eval $(call gb_Library_add_linked_libs,so_activex,\ +$(eval $(call gb_Library_use_libraries,so_activex,\ uuid \ advapi32 \ ole32 \ diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 3839f9e0c1a7..723c66787f33 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,so_activex_x64)) $(eval $(call gb_Library_set_x64,so_activex_x64,YES)) -$(eval $(call gb_Library_add_custom_headers,so_activex_x64,extensions/source/activex/idl)) +$(eval $(call gb_Library_use_custom_headers,so_activex_x64,extensions/source/activex/idl)) $(eval $(call gb_Library_set_include,so_activex_x64,\ $$(INCLUDE) \ @@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) -$(eval $(call gb_Library_add_api,so_activex_x64,\ +$(eval $(call gb_Library_use_api,so_activex_x64,\ offapi \ udkapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \ )) -$(eval $(call gb_Library_add_linked_libs,so_activex_x64,\ +$(eval $(call gb_Library_use_libraries,so_activex_x64,\ uuid \ advapi32 \ ole32 \ diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk index c336738bce42..196fe7f3d314 100644 --- a/extensions/Library_updatecheckui.mk +++ b/extensions/Library_updatecheckui.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,updatecheckui)) $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk)) -$(eval $(call gb_Library_add_api,updatecheckui,\ +$(eval $(call gb_Library_use_api,updatecheckui,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,updatecheckui,\ +$(eval $(call gb_Library_use_libraries,updatecheckui,\ vcl \ tl \ comphelper \ diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk index 00a42c49b723..cd1b581e7830 100644 --- a/extensions/Library_updatefeed.mk +++ b/extensions/Library_updatefeed.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,updatefeed)) $(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed)) -$(eval $(call gb_Library_add_api,updatefeed,\ +$(eval $(call gb_Library_use_api,updatefeed,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,updatefeed,\ +$(eval $(call gb_Library_use_libraries,updatefeed,\ cppuhelper \ cppu \ sal \ diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index c5286de8e08d..98577ee3941a 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -36,19 +36,19 @@ $(eval $(call gb_Library_set_include,updchk,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_Library_add_api,updchk,\ +$(eval $(call gb_Library_use_api,updchk,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,updchk,\ +$(eval $(call gb_Library_use_libraries,updchk,\ cppuhelper \ cppu \ sal \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,updchk,\ +$(eval $(call gb_Library_use_libraries,updchk,\ ole32 \ shell32 \ wininet \ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 1d268180bd37..0ef41afc3c55 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -31,7 +31,7 @@ endif $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) -$(eval $(call gb_StaticLibrary_add_external_headers,plugcon,np_sdk_inc)) +$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc)) $(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers)) @@ -40,7 +40,7 @@ $(eval $(call gb_StaticLibrary_set_include,plugcon,\ -I$(SRCDIR)/extensions/source/plugin/inc \ )) -$(eval $(call gb_StaticLibrary_add_api,plugcon,\ +$(eval $(call gb_StaticLibrary_use_api,plugcon,\ offapi \ udkapi \ )) diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk index 6689f0f439e0..01300bb5e279 100644 --- a/fileaccess/Library_fileacc.mk +++ b/fileaccess/Library_fileacc.mk @@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,fileacc,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,fileacc,\ +$(eval $(call gb_Library_use_api,fileacc,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,fileacc,\ +$(eval $(call gb_Library_use_libraries,fileacc,\ cppu \ cppuhelper \ sal \ diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index 3faed543f476..fb0eccc534cf 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_tga_test, \ filter/qa/cppunit/filters-tga-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,filter_tga_test, \ +$(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \ itg \ sal \ test \ @@ -45,18 +45,18 @@ $(eval $(call gb_CppunitTest_set_include,filter_tga_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,filter_tga_test,\ +$(eval $(call gb_CppunitTest_use_api,filter_tga_test,\ udkapi \ offapi \ )) $(eval $(call gb_CppunitTest_uses_ure,filter_tga_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,filter_tga_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,filter_tga_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,filter_tga_test,\ +$(eval $(call gb_CppunitTest_use_components,filter_tga_test,\ configmgr/source/configmgr \ )) diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index a6ea2f34f38b..dc52b2e6746c 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_tiff_test, \ filter/qa/cppunit/filters-tiff-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,filter_tiff_test, \ +$(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \ iti \ sal \ test \ @@ -45,18 +45,18 @@ $(eval $(call gb_CppunitTest_set_include,filter_tiff_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,filter_tiff_test,\ +$(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\ udkapi \ offapi \ )) $(eval $(call gb_CppunitTest_uses_ure,filter_tiff_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,filter_tiff_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,filter_tiff_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,filter_tiff_test,\ +$(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\ configmgr/source/configmgr \ )) diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk index da798a4f445a..9522c26ad40e 100644 --- a/filter/Jar_XSLTFilter.mk +++ b/filter/Jar_XSLTFilter.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Jar_Jar,XSLTFilter)) -$(eval $(call gb_Jar_add_jars,XSLTFilter,\ +$(eval $(call gb_Jar_use_jars,XSLTFilter,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/filter/Jar_XSLTValidate.mk b/filter/Jar_XSLTValidate.mk index cd578fae0167..f67014cbf151 100644 --- a/filter/Jar_XSLTValidate.mk +++ b/filter/Jar_XSLTValidate.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Jar_Jar,XSLTValidate)) -$(eval $(call gb_Jar_add_jars,XSLTValidate,\ +$(eval $(call gb_Jar_use_jars,XSLTValidate,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/filter/JunitTest_filter_complex.mk b/filter/JunitTest_filter_complex.mk index 0902b99adce9..d6089023ff82 100644 --- a/filter/JunitTest_filter_complex.mk +++ b/filter/JunitTest_filter_complex.mk @@ -19,7 +19,7 @@ $(eval $(call gb_JunitTest_JunitTest,filter_complex)) -$(eval $(call gb_JunitTest_add_jars,filter_complex,\ +$(eval $(call gb_JunitTest_use_jars,filter_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/filter/Library_PptImporter.mk b/filter/Library_PptImporter.mk index 6401c839a392..355d7dc7daae 100644 --- a/filter/Library_PptImporter.mk +++ b/filter/Library_PptImporter.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,PptImporter)) -$(eval $(call gb_Library_add_api,PptImporter,\ +$(eval $(call gb_Library_use_api,PptImporter,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,PptImporter,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,PptImporter,\ +$(eval $(call gb_Library_use_libraries,PptImporter,\ sot \ tl \ cppuhelper \ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index 14042817ce02..96956557cdae 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,egi)) -$(eval $(call gb_Library_add_api,egi,\ +$(eval $(call gb_Library_use_api,egi,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,egi,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,egi,\ +$(eval $(call gb_Library_use_libraries,egi,\ svt \ vcl \ tl \ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index 936de18f3091..82a3afaffd61 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,eme)) -$(eval $(call gb_Library_add_api,eme,\ +$(eval $(call gb_Library_use_api,eme,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,eme,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,eme,\ +$(eval $(call gb_Library_use_libraries,eme,\ svt \ vcl \ tl \ diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index a48dd742a513..e4077297c282 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,epb)) -$(eval $(call gb_Library_add_api,epb,\ +$(eval $(call gb_Library_use_api,epb,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,epb,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,epb,\ +$(eval $(call gb_Library_use_libraries,epb,\ svt \ vcl \ tl \ diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index 348e7e3bbf77..9636270a427f 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,epg)) -$(eval $(call gb_Library_add_api,epg,\ +$(eval $(call gb_Library_use_api,epg,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,epg,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,epg,\ +$(eval $(call gb_Library_use_libraries,epg,\ svt \ vcl \ tl \ diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 3412a58c5963..4e2d8b9352e3 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,epp)) -$(eval $(call gb_Library_add_api,epp,\ +$(eval $(call gb_Library_use_api,epp,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,epp,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,epp,\ +$(eval $(call gb_Library_use_libraries,epp,\ svt \ vcl \ tl \ diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index 05eaf7a61cfd..4599fa926de8 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,eps)) -$(eval $(call gb_Library_add_api,eps,\ +$(eval $(call gb_Library_use_api,eps,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,eps,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,eps,\ +$(eval $(call gb_Library_use_libraries,eps,\ svt \ vcl \ utl \ diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index 18621bfe74f8..b3530c42a85e 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ept)) -$(eval $(call gb_Library_add_api,ept,\ +$(eval $(call gb_Library_use_api,ept,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ept,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ept,\ +$(eval $(call gb_Library_use_libraries,ept,\ svt \ vcl \ tl \ diff --git a/filter/Library_era.mk b/filter/Library_era.mk index 512f8d7ef66f..478085cbd0d7 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,era)) -$(eval $(call gb_Library_add_api,era,\ +$(eval $(call gb_Library_use_api,era,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,era,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,era,\ +$(eval $(call gb_Library_use_libraries,era,\ svt \ vcl \ tl \ diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 6ccc1aa895e8..d8ff63b0fb87 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,eti)) -$(eval $(call gb_Library_add_api,eti,\ +$(eval $(call gb_Library_use_api,eti,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,eti,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,eti,\ +$(eval $(call gb_Library_use_libraries,eti,\ svt \ vcl \ tl \ diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index d7e4d2ff944f..387870c69c3c 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,exp)) -$(eval $(call gb_Library_add_api,exp,\ +$(eval $(call gb_Library_use_api,exp,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,exp,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,exp,\ +$(eval $(call gb_Library_use_libraries,exp,\ svt \ vcl \ tl \ diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 39346e70944a..2d30fe7d5a1b 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,filterconfig)) $(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1)) -$(eval $(call gb_Library_add_api,filterconfig,\ +$(eval $(call gb_Library_use_api,filterconfig,\ udkapi \ offapi \ )) @@ -31,7 +31,7 @@ $(eval $(call gb_Library_set_include,filterconfig,\ -I$(SRCDIR)/filter/inc \ )) -$(eval $(call gb_Library_add_linked_libs,filterconfig,\ +$(eval $(call gb_Library_use_libraries,filterconfig,\ fwe \ utl \ tl \ diff --git a/filter/Library_filtertracer.mk b/filter/Library_filtertracer.mk index 25554cc4facc..58b451bdff7e 100644 --- a/filter/Library_filtertracer.mk +++ b/filter/Library_filtertracer.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,filtertracer)) -$(eval $(call gb_Library_add_api,filtertracer,\ +$(eval $(call gb_Library_use_api,filtertracer,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,filtertracer,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,filtertracer,\ +$(eval $(call gb_Library_use_libraries,filtertracer,\ utl \ tl \ cppuhelper \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index c7a5cfaf937b..2d08b8aa6620 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,flash)) $(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash)) -$(eval $(call gb_Library_add_api,flash,\ +$(eval $(call gb_Library_use_api,flash,\ udkapi \ offapi \ )) @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,flash,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,flash,\ +$(eval $(call gb_Library_use_libraries,flash,\ svt \ vcl \ utl \ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index f51dbbf28bdd..1ec5b599fc03 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,icd)) -$(eval $(call gb_Library_add_api,icd,\ +$(eval $(call gb_Library_use_api,icd,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,icd,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,icd,\ +$(eval $(call gb_Library_use_libraries,icd,\ svt \ vcl \ tl \ diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index d9d218c6c0e3..e090471522e7 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,icg)) -$(eval $(call gb_Library_add_api,icg,\ +$(eval $(call gb_Library_use_api,icg,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,icg,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,icg,\ +$(eval $(call gb_Library_use_libraries,icg,\ comphelper \ tk \ vcl \ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index b872ae999da0..b8842e27b6ce 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,idx)) -$(eval $(call gb_Library_add_api,idx,\ +$(eval $(call gb_Library_use_api,idx,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,idx,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,idx,\ +$(eval $(call gb_Library_use_libraries,idx,\ vcl \ tl \ sal \ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index f8e616849259..d3dbd78fd4b7 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ime)) -$(eval $(call gb_Library_add_api,ime,\ +$(eval $(call gb_Library_use_api,ime,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ime,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ime,\ +$(eval $(call gb_Library_use_libraries,ime,\ vcl \ tl \ sal \ diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index 3f555db21328..4f1cb0ee179f 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ipb)) -$(eval $(call gb_Library_add_api,ipb,\ +$(eval $(call gb_Library_use_api,ipb,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ipb,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ipb,\ +$(eval $(call gb_Library_use_libraries,ipb,\ vcl \ tl \ sal \ diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index dbafcfdef069..a82e4810230b 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ipd)) -$(eval $(call gb_Library_add_api,ipd,\ +$(eval $(call gb_Library_use_api,ipd,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ipd,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ipd,\ +$(eval $(call gb_Library_use_libraries,ipd,\ vcl \ tl \ sal \ diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index 2fa43af8ec15..a2b9d55f5363 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ips)) -$(eval $(call gb_Library_add_api,ips,\ +$(eval $(call gb_Library_use_api,ips,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ips,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ips,\ +$(eval $(call gb_Library_use_libraries,ips,\ vcl \ tl \ sal \ diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index 9142a80e8732..353e4e47293b 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ipt)) -$(eval $(call gb_Library_add_api,ipt,\ +$(eval $(call gb_Library_use_api,ipt,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ipt,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ipt,\ +$(eval $(call gb_Library_use_libraries,ipt,\ vcl \ tl \ basegfx \ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 1665b3cbb522..9a7b5877d30f 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ipx)) -$(eval $(call gb_Library_add_api,ipx,\ +$(eval $(call gb_Library_use_api,ipx,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ipx,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ipx,\ +$(eval $(call gb_Library_use_libraries,ipx,\ vcl \ tl \ sal \ diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index e3f9f09ee104..65c8e4a294cb 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,ira)) -$(eval $(call gb_Library_add_api,ira,\ +$(eval $(call gb_Library_use_api,ira,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,ira,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,ira,\ +$(eval $(call gb_Library_use_libraries,ira,\ vcl \ tl \ sal \ diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index 88f0be61b53f..6d7ffa9c986f 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,itg)) -$(eval $(call gb_Library_add_api,itg,\ +$(eval $(call gb_Library_use_api,itg,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,itg,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,itg,\ +$(eval $(call gb_Library_use_libraries,itg,\ vcl \ tl \ sal \ diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index 00b2a8fafef0..92412265bc81 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,iti)) -$(eval $(call gb_Library_add_api,iti,\ +$(eval $(call gb_Library_use_api,iti,\ udkapi \ offapi \ )) @@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_include,iti,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,iti,\ +$(eval $(call gb_Library_use_libraries,iti,\ vcl \ tl \ sal \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index e454dfbcd906..0c08a802e107 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_package_headers,msfilter,filter_inc)) $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter)) -$(eval $(call gb_Library_add_api,msfilter,\ +$(eval $(call gb_Library_use_api,msfilter,\ udkapi \ offapi \ )) @@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_defs,msfilter,\ -DMSFILTER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,msfilter,\ +$(eval $(call gb_Library_use_libraries,msfilter,\ svxcore \ editeng \ sfx \ diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk index 68a5ef2d7b44..2e2d03b35168 100644 --- a/filter/Library_odfflatxml.mk +++ b/filter/Library_odfflatxml.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,odfflatxml)) $(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml)) -$(eval $(call gb_Library_add_api,odfflatxml,\ +$(eval $(call gb_Library_use_api,odfflatxml,\ udkapi \ offapi \ )) @@ -39,7 +39,7 @@ $(eval $(call gb_Library_set_include,odfflatxml,\ -I$(SRCDIR)/filter/inc \ )) -$(eval $(call gb_Library_add_linked_libs,odfflatxml,\ +$(eval $(call gb_Library_use_libraries,odfflatxml,\ xo \ tl \ ucbhelper \ diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index cfecd7309f1e..53a2a56199b2 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,pdffilter)) $(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter)) -$(eval $(call gb_Library_add_api,pdffilter,\ +$(eval $(call gb_Library_use_api,pdffilter,\ udkapi \ offapi \ )) @@ -31,7 +31,7 @@ $(eval $(call gb_Library_set_include,pdffilter,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,pdffilter,\ +$(eval $(call gb_Library_use_libraries,pdffilter,\ svt \ sfx \ tk \ diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk index d0af3c1e20de..9b2f09c79a19 100644 --- a/filter/Library_placeware.mk +++ b/filter/Library_placeware.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,placeware)) $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/placeware)) -$(eval $(call gb_Library_add_api,placeware,\ +$(eval $(call gb_Library_use_api,placeware,\ udkapi \ offapi \ )) @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,placeware,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,placeware,\ +$(eval $(call gb_Library_use_libraries,placeware,\ cppuhelper \ cppu \ sal \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 567c29606aa0..b5ebe23b3b91 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,svgfilter)) -$(eval $(call gb_Library_add_custom_headers,svgfilter,filter/source/svg)) +$(eval $(call gb_Library_use_custom_headers,svgfilter,filter/source/svg)) $(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter)) @@ -27,12 +27,12 @@ $(eval $(call gb_Library_add_defs,svgfilter,\ -DUSE_MODERN_SPIRIT \ )) -$(eval $(call gb_Library_add_api,svgfilter,\ +$(eval $(call gb_Library_use_api,svgfilter,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,svgfilter,\ +$(eval $(call gb_Library_use_libraries,svgfilter,\ svxcore \ editeng \ xo \ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index b2600b1040b4..d1d8e14720c3 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,t602filter)) $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter)) -$(eval $(call gb_Library_add_api,t602filter,\ +$(eval $(call gb_Library_use_api,t602filter,\ udkapi \ offapi \ )) @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,t602filter,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,t602filter,\ +$(eval $(call gb_Library_use_libraries,t602filter,\ xo \ tl \ cppuhelper \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index 0da3e8e5998c..6e9618fc7a60 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,xmlfa)) $(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa)) -$(eval $(call gb_Library_add_api,xmlfa,\ +$(eval $(call gb_Library_use_api,xmlfa,\ udkapi \ offapi \ )) @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,xmlfa,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,xmlfa,\ +$(eval $(call gb_Library_use_libraries,xmlfa,\ tl \ comphelper \ cppuhelper \ diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk index f1863a5ce9dc..9735517c8619 100644 --- a/filter/Library_xmlfd.mk +++ b/filter/Library_xmlfd.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,xmlfd)) $(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd)) -$(eval $(call gb_Library_add_api,xmlfd,\ +$(eval $(call gb_Library_use_api,xmlfd,\ udkapi \ offapi \ )) @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,xmlfd,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,xmlfd,\ +$(eval $(call gb_Library_use_libraries,xmlfd,\ ucbhelper \ cppuhelper \ cppu \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 89f2fadefb92..c5eda06b55ad 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,xsltdlg)) $(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg)) -$(eval $(call gb_Library_add_api,xsltdlg,\ +$(eval $(call gb_Library_use_api,xsltdlg,\ udkapi \ offapi \ )) @@ -31,7 +31,7 @@ $(eval $(call gb_Library_set_include,xsltdlg,\ -I$(SRCDIR)/filter/inc \ )) -$(eval $(call gb_Library_add_linked_libs,xsltdlg,\ +$(eval $(call gb_Library_use_libraries,xsltdlg,\ sfx \ svt \ tk \ diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk index b9e7a6ebc0ae..4c8c4ef3aa10 100644 --- a/filter/Library_xsltfilter.mk +++ b/filter/Library_xsltfilter.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,xsltfilter)) $(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter)) -$(eval $(call gb_Library_add_api,xsltfilter,\ +$(eval $(call gb_Library_use_api,xsltfilter,\ udkapi \ offapi \ )) @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,xsltfilter,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,xsltfilter,\ +$(eval $(call gb_Library_use_libraries,xsltfilter,\ xo \ tl \ package2 \ diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk index c61af34e7571..736ca41a1c58 100644 --- a/forms/JunitTest_forms_complex.mk +++ b/forms/JunitTest_forms_complex.mk @@ -28,7 +28,7 @@ $(eval $(call gb_JunitTest_JunitTest,forms_complex)) -$(eval $(call gb_JunitTest_add_jars,forms_complex,\ +$(eval $(call gb_JunitTest_use_jars,forms_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk index b23f2f645b7d..ea4cb505a78b 100644 --- a/forms/JunitTest_forms_unoapi.mk +++ b/forms/JunitTest_forms_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,forms_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,forms_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,forms_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 64005600f545..126bc5f339f2 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -33,13 +33,13 @@ $(eval $(call gb_Library_set_include,frm,\ -I$(SRCDIR)/forms/source/solar/inc \ )) -$(eval $(call gb_Library_add_api,frm,\ +$(eval $(call gb_Library_use_api,frm,\ offapi \ oovbaapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,frm,\ +$(eval $(call gb_Library_use_libraries,frm,\ comphelper \ cppu \ cppuhelper \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index d3f67cd28a90..751194b37dbc 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_defs,for,\ -DFORMULA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,for,\ +$(eval $(call gb_Library_use_api,for,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,for,\ +$(eval $(call gb_Library_use_libraries,for,\ comphelper \ cppu \ cppuhelper \ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 1a4268997c2e..a2a90a8a8578 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,forui,\ -DFORMULA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,forui,\ +$(eval $(call gb_Library_use_api,forui,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,forui,\ +$(eval $(call gb_Library_use_libraries,forui,\ comphelper \ cppu \ cppuhelper \ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index 229b003e5a28..ba14d33261d0 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,fpicker)) $(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker)) -$(eval $(call gb_Library_add_api,fpicker,\ +$(eval $(call gb_Library_use_api,fpicker,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,fpicker,\ +$(eval $(call gb_Library_use_libraries,fpicker,\ cppu \ cppuhelper \ sal \ @@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,fpicker,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_static_libs,fpicker,\ +$(eval $(call gb_Library_use_static_libraries,fpicker,\ odma_lib \ )) endif diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 986b16789849..aa6251771494 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/src)) $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps)) -$(eval $(call gb_Library_add_api,fps,\ +$(eval $(call gb_Library_use_api,fps,\ offapi \ udkapi \ )) @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,fps,\ -D_WIN32_WINNT=0x0600 \ )) -$(eval $(call gb_Library_add_linked_libs,fps,\ +$(eval $(call gb_Library_use_libraries,fps,\ comphelper \ cppu \ cppuhelper \ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index a2575d08dc7f..18bad445f52d 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,fps_aqua)) $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua)) -$(eval $(call gb_Library_add_api,fps_aqua,\ +$(eval $(call gb_Library_use_api,fps_aqua,\ offapi \ udkapi \ )) @@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_libs,fps_aqua,\ -framework CoreFoundation \ )) -$(eval $(call gb_Library_add_linked_libs,fps_aqua,\ +$(eval $(call gb_Library_use_libraries,fps_aqua,\ cppu \ cppuhelper \ sal \ diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk index 754487601293..d55c1d1a2a48 100644 --- a/fpicker/Library_fps_odma.mk +++ b/fpicker/Library_fps_odma.mk @@ -27,12 +27,12 @@ $(eval $(call gb_Library_Library,fps_odma)) -$(eval $(call gb_Library_add_api,fps_odma,\ +$(eval $(call gb_Library_use_api,fps_odma,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,fps_odma,\ +$(eval $(call gb_Library_use_libraries,fps_odma,\ comphelper \ cppu \ cppuhelper \ @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,fps_odma,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_static_libs,fps_odma,\ +$(eval $(call gb_Library_use_static_libraries,fps_odma,\ odma_lib \ )) endif diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 1f0e9983b726..af5bc1b1265a 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,fps_office)) $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office)) -$(eval $(call gb_Library_add_api,fps_office,\ +$(eval $(call gb_Library_use_api,fps_office,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,fps_office,\ +$(eval $(call gb_Library_use_libraries,fps_office,\ comphelper \ cppu \ cppuhelper \ 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 \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index 841e199a6dd0..2df1dbda1170 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,hwpfilter_test_hwpfilter, \ hwpfilter/qa/cppunit/test_hwpfilter \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,hwpfilter_test_hwpfilter, \ +$(eval $(call gb_CppunitTest_use_libraries,hwpfilter_test_hwpfilter, \ ucbhelper \ comphelper \ cppu \ @@ -49,18 +49,18 @@ $(eval $(call gb_CppunitTest_set_include,hwpfilter_test_hwpfilter,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,hwpfilter_test_hwpfilter,\ +$(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,hwpfilter_test_hwpfilter)) -$(eval $(call gb_CppunitTest_add_type_rdbs,hwpfilter_test_hwpfilter,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,hwpfilter_test_hwpfilter,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,hwpfilter_test_hwpfilter,\ +$(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\ configmgr/source/configmgr \ hwpfilter/source/hwp \ ucb/source/core/ucb1 \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 49a7c80c126e..ec189cd94bdf 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,hwp,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,hwp,\ +$(eval $(call gb_Library_use_api,hwp,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,hwp,\ +$(eval $(call gb_Library_use_libraries,hwp,\ comphelper \ cppu \ cppuhelper \ @@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_external,hwp,zlib)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,hwp,\ +$(eval $(call gb_Library_use_libraries,hwp,\ ole32 \ uuid \ )) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 339191422f60..3d8b160b4017 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -32,12 +32,12 @@ $(eval $(call gb_CppunitTest_set_include,i18npool_test_breakiterator,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_api,i18npool_test_breakiterator,\ udkapi \ offapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ cppu \ cppuhelper \ sal \ @@ -50,11 +50,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ $(eval $(call gb_CppunitTest_uses_ure,i18npool_test_breakiterator)) -$(eval $(call gb_CppunitTest_add_type_rdbs,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,i18npool_test_breakiterator,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\ i18npool/util/i18npool \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 0a39b4623d95..b1d0bd46b1a4 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Executable_add_linked_libs,gencoll_rule,\ +$(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index e9de4dbf8dab..85a49b15e655 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,genconv_dict,\ +$(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index c5e824d55fda..3941b10a09f0 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Executable_set_include,gendict,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,gendict,\ +$(eval $(call gb_Executable_use_libraries,gendict,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 733b6c5c2512..3665f44e9aec 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Executable_set_include,genindex_data,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,genindex_data,\ +$(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index 03376a25e23e..cbd01f8c07d1 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Executable_set_include,saxparser,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_api,saxparser,\ +$(eval $(call gb_Executable_use_api,saxparser,\ udkapi \ offapi \ )) -$(eval $(call gb_Executable_add_linked_libs,saxparser,\ +$(eval $(call gb_Executable_use_libraries,saxparser,\ cppu \ cppuhelper \ sal \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index 85b1a978e5db..bd6ee6048f1c 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,collator_data)) -$(eval $(call gb_Library_add_linked_libs,collator_data,\ +$(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index f164548bcfb7..89784694b4f7 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,dict_ja)) -$(eval $(call gb_Library_add_linked_libs,dict_ja,\ +$(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index cd48f4529a6f..2a910e502136 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,dict_zh)) -$(eval $(call gb_Library_add_linked_libs,dict_zh,\ +$(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 26a388dc3862..613548ecf252 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,i18nisolang1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,i18nisolang1,\ +$(eval $(call gb_Library_use_api,i18nisolang1,\ udkapi \ offapi \ )) @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\ -DI18NISOLANG_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,i18nisolang1,\ +$(eval $(call gb_Library_use_libraries,i18nisolang1,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 0bdbfe790392..5ba850beca5d 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,i18npool,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Library_add_api,i18npool,\ +$(eval $(call gb_Library_use_api,i18npool,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,i18npool,\ +$(eval $(call gb_Library_use_libraries,i18npool,\ comphelper \ cppu \ cppuhelper \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 310ff68c39a7..88ddbe2a8a00 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,i18nsearch,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,i18nsearch,\ +$(eval $(call gb_Library_use_api,i18nsearch,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,i18nsearch,\ +$(eval $(call gb_Library_use_libraries,i18nsearch,\ cppu \ cppuhelper \ i18nregexp \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 2d8b9b5f1470..9a7270c82c1f 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,index_data)) -$(eval $(call gb_Library_add_linked_libs,index_data,\ +$(eval $(call gb_Library_use_libraries,index_data,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index f44fab2da2e6..fe944a792350 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_en)) -$(eval $(call gb_Library_add_linked_libs,localedata_en,\ +$(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 29d1bb7cfa1d..0d8f1ea77283 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_es)) -$(eval $(call gb_Library_add_linked_libs,localedata_es,\ +$(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index df98d667ca87..676d6effcdd2 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_euro)) -$(eval $(call gb_Library_add_linked_libs,localedata_euro,\ +$(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index 432fbeeecb5d..f50c28118d57 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_others)) -$(eval $(call gb_Library_add_linked_libs,localedata_others,\ +$(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index c9dacd9ff43d..675f61530a68 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,textconv_dict,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Library_add_api,textconv_dict,\ +$(eval $(call gb_Library_use_api,textconv_dict,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,textconv_dict,\ +$(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_STDLIBS) \ )) diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index 990b1cafe314..9b8b7dd1653d 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,i18nutil)) $(eval $(call gb_Library_add_package_headers,i18nutil,i18nutil_inc)) -$(eval $(call gb_Library_add_api,i18nutil,\ +$(eval $(call gb_Library_use_api,i18nutil,\ udkapi \ offapi \ )) @@ -38,7 +38,7 @@ $(eval $(call gb_Library_add_defs,i18nutil,\ -DI18NUTIL_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,i18nutil,\ +$(eval $(call gb_Library_use_libraries,i18nutil,\ comphelper \ cppu \ sal \ diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index 97db4c7816c7..c41f1386764b 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Executable_set_include,svidl,\ -I$(SRCDIR)/idl/inc \ )) -$(eval $(call gb_Executable_add_api,svidl,\ +$(eval $(call gb_Executable_use_api,svidl,\ offapi \ udkapi \ )) -$(eval $(call gb_Executable_add_linked_libs,svidl,\ +$(eval $(call gb_Executable_use_libraries,svidl,\ tl \ sal \ $(gb_STDLIBS) \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index 12639b98baab..426460012f06 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -27,11 +27,11 @@ $(eval $(call gb_Library_Library,acceptor)) -$(eval $(call gb_Library_add_internal_api,acceptor,\ +$(eval $(call gb_Library_use_internal_api,acceptor,\ acceptor \ )) -$(eval $(call gb_Library_add_linked_libs,acceptor,\ +$(eval $(call gb_Library_use_libraries,acceptor,\ cppu \ cppuhelper \ sal \ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 07ddfb9b705f..95a03c0a8429 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -27,11 +27,11 @@ $(eval $(call gb_Library_Library,connector)) -$(eval $(call gb_Library_add_internal_api,connector,\ +$(eval $(call gb_Library_use_internal_api,connector,\ connectr \ )) -$(eval $(call gb_Library_add_linked_libs,connector,\ +$(eval $(call gb_Library_use_libraries,connector,\ cppu \ cppuhelper \ sal \ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 66d866371040..2745bf3e6af8 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -27,11 +27,11 @@ $(eval $(call gb_Library_Library,streams)) -$(eval $(call gb_Library_add_internal_api,streams,\ +$(eval $(call gb_Library_use_internal_api,streams,\ stm \ )) -$(eval $(call gb_Library_add_linked_libs,streams,\ +$(eval $(call gb_Library_use_libraries,streams,\ cppu \ cppuhelper \ sal \ diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk index b6d0f82ec9a7..d9c67a245fc1 100644 --- a/io/Library_textinstream.mk +++ b/io/Library_textinstream.mk @@ -27,11 +27,11 @@ $(eval $(call gb_Library_Library,textinstream)) -$(eval $(call gb_Library_add_api,textinstream,\ +$(eval $(call gb_Library_use_api,textinstream,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,textinstream,\ +$(eval $(call gb_Library_use_libraries,textinstream,\ cppu \ cppuhelper \ sal \ diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk index 6de90504ba73..0fdaf7ffd9c9 100644 --- a/io/Library_textoutstream.mk +++ b/io/Library_textoutstream.mk @@ -27,11 +27,11 @@ $(eval $(call gb_Library_Library,textoutstream)) -$(eval $(call gb_Library_add_api,textoutstream,\ +$(eval $(call gb_Library_use_api,textoutstream,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,textoutstream,\ +$(eval $(call gb_Library_use_libraries,textoutstream,\ cppu \ cppuhelper \ sal \ diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk index ef319babff97..6ed9d239df8f 100644 --- a/javaunohelper/Jar_juh.mk +++ b/javaunohelper/Jar_juh.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,juh)) -$(eval $(call gb_Jar_add_jars,juh,\ +$(eval $(call gb_Jar_use_jars,juh,\ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index 7c34479548da..c72efbe70f4a 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -36,11 +36,11 @@ $(eval $(call gb_Library_set_include,juh,\ -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \ )) -$(eval $(call gb_Library_add_api,juh,\ +$(eval $(call gb_Library_use_api,juh,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,juh,\ +$(eval $(call gb_Library_use_libraries,juh,\ sal \ $(gb_STDLIBS) \ )) diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index fe066b45065b..cd21583ef9ff 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,juhx,\ -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \ )) -$(eval $(call gb_Library_add_linked_libs,juhx,\ +$(eval $(call gb_Library_use_libraries,juhx,\ cppu \ cppuhelper \ jvmaccess \ diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk index 4cd6bb80dbd1..9fbabec3c016 100644 --- a/jurt/Jar_jurt.mk +++ b/jurt/Jar_jurt.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,jurt)) -$(eval $(call gb_Jar_add_jars,jurt,\ +$(eval $(call gb_Jar_use_jars,jurt,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoloader.jar \ )) diff --git a/jurt/JunitTest_bridgefactory.mk b/jurt/JunitTest_bridgefactory.mk index 28272cfae836..b5211a3273d7 100644 --- a/jurt/JunitTest_bridgefactory.mk +++ b/jurt/JunitTest_bridgefactory.mk @@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_bridgefactory)) -$(eval $(call gb_JunitTest_add_jars,jurt_bridgefactory,\ +$(eval $(call gb_JunitTest_use_jars,jurt_bridgefactory,\ $(OUTDIR)/bin/ridl.jar \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_bridgefactory,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_bridgefactory,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_bridgefactory,\ jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test \ diff --git a/jurt/JunitTest_connections.mk b/jurt/JunitTest_connections.mk index 1b21302245a5..e5f1c6a5e0a9 100644 --- a/jurt/JunitTest_connections.mk +++ b/jurt/JunitTest_connections.mk @@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_connections)) -$(eval $(call gb_JunitTest_add_jars,jurt_connections,\ +$(eval $(call gb_JunitTest_use_jars,jurt_connections,\ $(OUTDIR)/bin/ridl.jar \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_connections,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_connections,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_connections,\ jurt/test/com/sun/star/comp/connections/PipedConnection_Test \ diff --git a/jurt/JunitTest_java.mk b/jurt/JunitTest_java.mk index 960144e083eb..a9cc19009b04 100644 --- a/jurt/JunitTest_java.mk +++ b/jurt/JunitTest_java.mk @@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_java)) -$(eval $(call gb_JunitTest_add_jars,jurt_java,\ +$(eval $(call gb_JunitTest_use_jars,jurt_java,\ $(OUTDIR)/bin/ridl.jar \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_java,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_java,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_java,\ jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test \ diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk index 0e5190c80428..9a103af1651a 100644 --- a/jurt/JunitTest_java_remote.mk +++ b/jurt/JunitTest_java_remote.mk @@ -27,12 +27,12 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_java_remote)) -$(eval $(call gb_JunitTest_add_jars,jurt_java_remote,\ +$(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\ $(OUTDIR)/bin/OOoRunnerLight.jar \ $(OUTDIR)/bin/ridl.jar \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_java_remote,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_java_remote,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_java_remote,\ jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test \ diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk index 37e4cd13bc9e..0267930e768e 100644 --- a/jurt/JunitTest_remote.mk +++ b/jurt/JunitTest_remote.mk @@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_remote)) -$(eval $(call gb_JunitTest_add_jars,jurt_remote,\ +$(eval $(call gb_JunitTest_use_jars,jurt_remote,\ $(OUTDIR)/bin/ridl.jar \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_remote,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_remote,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_remote,\ jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test \ diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk index 52223dda270c..5c4303ba2e26 100644 --- a/jurt/JunitTest_uno.mk +++ b/jurt/JunitTest_uno.mk @@ -27,12 +27,12 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_uno)) -$(eval $(call gb_JunitTest_add_jars,jurt_uno,\ +$(eval $(call gb_JunitTest_use_jars,jurt_uno,\ $(OUTDIR)/bin/OOoRunnerLight.jar \ $(OUTDIR)/bin/ridl.jar \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_uno,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_uno,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_uno,\ jurt/test/com/sun/star/uno/AnyConverter_Test \ diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk index a4ef41004021..21739c6644fc 100644 --- a/jurt/JunitTest_urp.mk +++ b/jurt/JunitTest_urp.mk @@ -27,16 +27,16 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_urp)) -$(eval $(call gb_JunitTest_add_customtarget_dependencies,jurt_urp,\ +$(eval $(call gb_JunitTest_use_customtargets,jurt_urp,\ jurt/test/com/sun/star/lib/uno/protocols/urp \ )) -$(eval $(call gb_JunitTest_add_jars,jurt_urp,\ +$(eval $(call gb_JunitTest_use_jars,jurt_urp,\ $(OUTDIR)/bin/ridl.jar \ $(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_urp,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_urp,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_urp,\ jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \ diff --git a/jurt/JunitTest_util.mk b/jurt/JunitTest_util.mk index 278e5ba13cfd..206903648a53 100644 --- a/jurt/JunitTest_util.mk +++ b/jurt/JunitTest_util.mk @@ -27,11 +27,11 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_util)) -$(eval $(call gb_JunitTest_add_jars,jurt_util,\ +$(eval $(call gb_JunitTest_use_jars,jurt_util,\ $(OUTDIR)/bin/ridl.jar \ )) -$(eval $(call gb_JunitTest_add_jar_classset,jurt_util,jurt)) +$(eval $(call gb_JunitTest_use_jar_classset,jurt_util,jurt)) $(eval $(call gb_JunitTest_add_sourcefiles,jurt_util,\ jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test \ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 4a8dfe5fdc0b..16707557f8f7 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,jpipe)) -$(eval $(call gb_Library_add_linked_libs,jpipe,\ +$(eval $(call gb_Library_use_libraries,jpipe,\ $(gb_STDLIBS) \ )) @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\ else -$(eval $(call gb_Library_add_linked_libs,jpipe,\ +$(eval $(call gb_Library_use_libraries,jpipe,\ sal \ )) diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk index 20579f83fb13..21087c2d291f 100644 --- a/jurt/Library_jpipx.mk +++ b/jurt/Library_jpipx.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,jpipx)) -$(eval $(call gb_Library_add_linked_libs,jpipx,\ +$(eval $(call gb_Library_use_libraries,jpipx,\ sal \ $(gb_STDLIBS) \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index c7bddf2860aa..904a61286900 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -37,11 +37,11 @@ $(eval $(call gb_Library_add_defs,jvmaccess,\ -DJVMACCESS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,jvmaccess,\ +$(eval $(call gb_Library_use_api,jvmaccess,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,jvmaccess,\ +$(eval $(call gb_Library_use_libraries,jvmaccess,\ cppu \ sal \ salhelper \ diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 49252f62f42e..9f5e080d6c81 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Executable_Executable,javaldx)) -$(eval $(call gb_Executable_add_linked_libs,javaldx,\ +$(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ $(gb_STDLIBS) \ diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 5b424d0aa58c..f1b67784ad2d 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -37,18 +37,18 @@ $(eval $(call gb_Library_add_defs,jvmfwk,\ -DJVMFWK_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,jvmfwk,\ +$(eval $(call gb_Library_use_api,jvmfwk,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ +$(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ $(gb_STDLIBS) \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ +$(eval $(call gb_Library_use_libraries,jvmfwk,\ advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index d1d2af4fe649..7d25d8d603f3 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -37,11 +37,11 @@ $(eval $(call gb_Library_add_defs,sunjavaplugin,\ )) endif -$(eval $(call gb_Library_add_api,sunjavaplugin,\ +$(eval $(call gb_Library_use_api,sunjavaplugin,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ +$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ cppu \ cppuhelper \ sal \ @@ -50,13 +50,13 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ )) ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ +$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ )) endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ +$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ advapi32 \ uwinapi \ )) diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk index 9245cbccdfac..4c99452fe4d0 100644 --- a/lingucomponent/Library_MacOSXSpell.mk +++ b/lingucomponent/Library_MacOSXSpell.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,MacOSXSpell,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_add_api,MacOSXSpell,\ +$(eval $(call gb_Library_use_api,MacOSXSpell,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,MacOSXSpell,\ +$(eval $(call gb_Library_use_libraries,MacOSXSpell,\ $(gb_STDLIBS) \ cppu \ cppuhelper \ diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk index 28727bab6468..0e1ea8d6bb3e 100644 --- a/lingucomponent/Library_guesslang.mk +++ b/lingucomponent/Library_guesslang.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,guesslang)) $(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang)) -$(eval $(call gb_Library_add_api,guesslang,\ +$(eval $(call gb_Library_use_api,guesslang,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,guesslang,\ +$(eval $(call gb_Library_use_libraries,guesslang,\ $(gb_STDLIBS) \ cppu \ cppuhelper \ diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index 781d39337a16..d518d6331f43 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,hyphen,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_add_api,hyphen,\ +$(eval $(call gb_Library_use_api,hyphen,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,hyphen,\ +$(eval $(call gb_Library_use_libraries,hyphen,\ $(gb_STDLIBS) \ cppu \ cppuhelper \ @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,hyphen,\ utl \ )) -$(eval $(call gb_Library_add_linked_static_libs,hyphen,\ +$(eval $(call gb_Library_use_static_libraries,hyphen,\ ulingu \ )) diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index 88ade12bee7e..ae392621d26b 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,lnth,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_add_api,lnth,\ +$(eval $(call gb_Library_use_api,lnth,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,lnth,\ +$(eval $(call gb_Library_use_libraries,lnth,\ $(gb_STDLIBS) \ comphelper \ cppu \ @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,lnth,\ utl \ )) -$(eval $(call gb_Library_add_linked_static_libs,lnth,\ +$(eval $(call gb_Library_use_static_libraries,lnth,\ ulingu \ )) diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 8085fc382833..1914917bae83 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,spell,\ -I$(SRCDIR)/lingucomponent/source/lingutil \ )) -$(eval $(call gb_Library_add_api,spell,\ +$(eval $(call gb_Library_use_api,spell,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,spell,\ +$(eval $(call gb_Library_use_libraries,spell,\ $(gb_STDLIBS) \ cppu \ cppuhelper \ @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,spell,\ utl \ )) -$(eval $(call gb_Library_add_linked_static_libs,spell,\ +$(eval $(call gb_Library_use_static_libraries,spell,\ ulingu \ )) diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk index b18b35509079..3bc66a25a5c3 100644 --- a/lingucomponent/StaticLibrary_ulingu.mk +++ b/lingucomponent/StaticLibrary_ulingu.mk @@ -27,7 +27,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu)) -$(eval $(call gb_StaticLibrary_add_api,ulingu,\ +$(eval $(call gb_StaticLibrary_use_api,ulingu,\ udkapi \ offapi \ )) diff --git a/linguistic/JunitTest_linguistic_complex.mk b/linguistic/JunitTest_linguistic_complex.mk index 2e761e986761..342c02ca9b3c 100644 --- a/linguistic/JunitTest_linguistic_complex.mk +++ b/linguistic/JunitTest_linguistic_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,linguistic_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/linguistic/qa/complex/linguistic/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,linguistic_complex,\ +$(eval $(call gb_JunitTest_use_jars,linguistic_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/linguistic/JunitTest_linguistic_unoapi.mk b/linguistic/JunitTest_linguistic_unoapi.mk index 1880272cdcbd..25a011d2e977 100644 --- a/linguistic/JunitTest_linguistic_unoapi.mk +++ b/linguistic/JunitTest_linguistic_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,linguistic_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/linguistic/qa/unoapi \ )) -$(eval $(call gb_JunitTest_add_jars,linguistic_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,linguistic_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index c5f2dcd838a2..22984a83b538 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,lng,\ -I$(SRCDIR)/linguistic/inc \ )) -$(eval $(call gb_Library_add_api,lng,\ +$(eval $(call gb_Library_use_api,lng,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,lng,\ -DLNG_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,lng,\ +$(eval $(call gb_Library_use_libraries,lng,\ comphelper \ cppu \ cppuhelper \ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index c0ffe681a25c..2dc96aac3dea 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_test_lotuswordpr lotuswordpro/qa/cppunit/test_lotuswordpro \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \ +$(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_test_lotuswordpro, \ comphelper \ cppu \ cppuhelper \ @@ -49,18 +49,18 @@ $(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,lotuswordpro_test_lotuswordpro,\ +$(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro)) -$(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,lotuswordpro_test_lotuswordpro,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,lotuswordpro_test_lotuswordpro,\ +$(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\ configmgr/source/configmgr \ lotuswordpro/util/lwpfilter \ ucb/source/core/ucb1 \ diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 7e06d1230184..b6e92cd5af5d 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,lwpft,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,lwpft,\ +$(eval $(call gb_Library_use_api,lwpft,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,lwpft,\ +$(eval $(call gb_Library_use_libraries,lwpft,\ comphelper \ cppu \ cppuhelper \ diff --git a/nlpsolver/Jar_EvolutionarySolver.mk b/nlpsolver/Jar_EvolutionarySolver.mk index 318dd8753aaa..1ebd0c886b7a 100644 --- a/nlpsolver/Jar_EvolutionarySolver.mk +++ b/nlpsolver/Jar_EvolutionarySolver.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,EvolutionarySolver)) -$(eval $(call gb_Jar_add_jars,EvolutionarySolver,\ +$(eval $(call gb_Jar_use_jars,EvolutionarySolver,\ )) $(eval $(call gb_Jar_set_packageroot,EvolutionarySolver,net/adaptivebox)) diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk index 21bc238c0960..a3db34a795fd 100644 --- a/nlpsolver/Jar_nlpsolver.mk +++ b/nlpsolver/Jar_nlpsolver.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,nlpsolver)) -$(eval $(call gb_Jar_add_jars,nlpsolver,\ +$(eval $(call gb_Jar_use_jars,nlpsolver,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 8657c6084a91..9eacbbbb7e5d 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -30,7 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,o3tl_tests)) $(eval $(call gb_CppunitTest_add_package_headers,o3tl_tests,o3tl_inc)) -$(eval $(call gb_CppunitTest_add_linked_libs,o3tl_tests,\ +$(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ $(gb_STDLIBS) \ )) diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index 249807198db0..6ce8a469a4a8 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) -$(eval $(call gb_CppunitTest_add_linked_libs,officecfg_cppheader_test,\ +$(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\ $(gb_STDLIBS) \ )) @@ -37,7 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \ officecfg/qa/cppheader \ )) -$(eval $(call gb_CppunitTest_add_api,officecfg_cppheader_test, \ +$(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \ udkapi \ )) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index ddd7ad73284d..7eae4ec3e9ec 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -52,12 +52,12 @@ $(eval $(call gb_Library_add_defs,oox,\ -DOOX_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,oox,\ +$(eval $(call gb_Library_use_api,oox,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,oox,\ +$(eval $(call gb_Library_use_libraries,oox,\ basegfx \ comphelper \ cppu \ diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 59630ff9a9c9..5be137e13ea4 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,package2,\ -I$(SRCDIR)/package/inc \ )) -$(eval $(call gb_Library_add_api,package2,\ +$(eval $(call gb_Library_use_api,package2,\ udkapi \ offapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,package2,\ -DDLLIMPLEMENTATION_PACKAGE \ )) -$(eval $(call gb_Library_add_linked_libs,package2,\ +$(eval $(call gb_Library_use_libraries,package2,\ comphelper \ cppu \ cppuhelper \ diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 0361a8293d32..458e4a0426dd 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,xstor,\ -I$(SRCDIR)/package/inc \ )) -$(eval $(call gb_Library_add_api,xstor,\ +$(eval $(call gb_Library_use_api,xstor,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,xstor,\ +$(eval $(call gb_Library_use_libraries,xstor,\ comphelper \ cppu \ cppuhelper \ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index 7dfb7d99a65a..9aca32b3508e 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -32,16 +32,16 @@ $(eval $(call gb_Executable_set_include,spadmin.bin,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_static_libraries,spadmin.bin,\ vclmain \ )) -$(eval $(call gb_Executable_add_api,spadmin.bin,\ +$(eval $(call gb_Executable_use_api,spadmin.bin,\ udkapi \ offapi \ )) -$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ spa \ svt \ vcl \ @@ -61,13 +61,13 @@ $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ pthread \ )) endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ +$(eval $(call gb_Executable_use_libraries,spadmin.bin,\ dl \ )) endif diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index ec6c1e79fcd6..cfae49a93b05 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_add_defs,spa,\ -DSPA_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,spa,\ +$(eval $(call gb_Library_use_api,spa,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,spa,\ +$(eval $(call gb_Library_use_libraries,spa,\ svt \ vcl \ utl \ @@ -63,14 +63,14 @@ $(eval $(call gb_Library_add_exception_objects,spa,\ )) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_add_linked_libs,spa,\ +$(eval $(call gb_Library_use_libraries,spa,\ m \ pthread \ )) endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,spa,\ +$(eval $(call gb_Library_use_libraries,spa,\ dl \ )) endif diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 4f59a0fae570..0a964a00350f 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Jar_set_jarclasspath,OOoRunner,\ $(eval $(call gb_Jar_set_manifest,OOoRunner,$(SRCDIR)/qadevOOo/runner/manifest)) -$(eval $(call gb_Jar_add_jars,OOoRunner,\ +$(eval $(call gb_Jar_use_jars,OOoRunner,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk index 63d11598fa32..1c58eef0608c 100644 --- a/qadevOOo/Jar_OOoRunnerLight.mk +++ b/qadevOOo/Jar_OOoRunnerLight.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Jar_set_jarclasspath,OOoRunnerLight,\ $(eval $(call gb_Jar_set_manifest,OOoRunnerLight,$(SRCDIR)/qadevOOo/runner/manifest)) -$(eval $(call gb_Jar_add_jars,OOoRunnerLight,\ +$(eval $(call gb_Jar_use_jars,OOoRunnerLight,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/qadevOOo/JunitTest_qadevOOo_unoapi.mk b/qadevOOo/JunitTest_qadevOOo_unoapi.mk index e048c6e5ad3b..11fdba23d9ca 100644 --- a/qadevOOo/JunitTest_qadevOOo_unoapi.mk +++ b/qadevOOo/JunitTest_qadevOOo_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,qadevOOo_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/qadevOOo/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,qadevOOo_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,qadevOOo_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index bd3352e6dc14..8ef6f5cb4d5c 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,i18nregexp)) $(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc)) -$(eval $(call gb_Library_add_api,i18nregexp,\ +$(eval $(call gb_Library_use_api,i18nregexp,\ offapi \ udkapi \ )) @@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_defs,i18nregexp,\ -DREGEXP_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,i18nregexp,\ +$(eval $(call gb_Library_use_libraries,i18nregexp,\ sal \ i18nutil \ $(gb_STDLIBS) \ diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk index 8d3bba6a0cd5..599bd5625080 100644 --- a/reportdesign/JunitTest_reportdesign_complex.mk +++ b/reportdesign/JunitTest_reportdesign_complex.mk @@ -39,7 +39,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\ reportdesign/qa/complex/reportdesign/FileURL \ )) -$(eval $(call gb_JunitTest_add_jars,reportdesign_complex,\ +$(eval $(call gb_JunitTest_use_jars,reportdesign_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 3cbdf0151cd7..0e18a8e9c736 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -38,12 +38,12 @@ $(eval $(call gb_Library_add_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,rpt,\ +$(eval $(call gb_Library_use_api,rpt,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,rpt,\ +$(eval $(call gb_Library_use_libraries,rpt,\ comphelper \ cppu \ cppuhelper \ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 6b6c8eb56823..83d91f36c8c2 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,rptui,\ -I$(SRCDIR)/reportdesign/source/ui/inc \ )) -$(eval $(call gb_Library_add_api,rptui,\ +$(eval $(call gb_Library_use_api,rptui,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,rptui,\ +$(eval $(call gb_Library_use_libraries,rptui,\ comphelper \ cppu \ cppuhelper \ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index 88727947e7f3..d27e64b91cff 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,rptxml,\ -I$(SRCDIR)/reportdesign/source/inc \ )) -$(eval $(call gb_Library_add_api,rptxml,\ +$(eval $(call gb_Library_use_api,rptxml,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,rptxml,\ +$(eval $(call gb_Library_use_libraries,rptxml,\ comphelper \ cppu \ cppuhelper \ diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk index 0dacfc36a7fd..e2452251c9e7 100644 --- a/ridljar/Jar_ridl.mk +++ b/ridljar/Jar_ridl.mk @@ -27,11 +27,11 @@ $(eval $(call gb_Jar_Jar,ridl)) -$(eval $(call gb_Jar_add_customtarget_dependencies,ridl,\ +$(eval $(call gb_Jar_use_customtargets,ridl,\ ridljar/javamaker \ )) -$(eval $(call gb_Jar_add_jars,ridl,\ +$(eval $(call gb_Jar_use_jars,ridl,\ $(WORKDIR)/CustomTarget/ridljar/javamaker/class \ )) diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk index 8b2afd0d16d3..baa8cdaa4ca3 100644 --- a/ridljar/JunitTest_typedesc.mk +++ b/ridljar/JunitTest_typedesc.mk @@ -27,7 +27,7 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_typedesc)) -$(eval $(call gb_JunitTest_add_jars,ridljar_typedesc,\ +$(eval $(call gb_JunitTest_use_jars,ridljar_typedesc,\ $(OUTDIR)/bin/ridl.jar \ )) diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk index 692b3445a7e3..7bbfab9bfdd5 100644 --- a/ridljar/JunitTest_uno.mk +++ b/ridljar/JunitTest_uno.mk @@ -27,7 +27,7 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_uno)) -$(eval $(call gb_JunitTest_add_jars,ridljar_uno,\ +$(eval $(call gb_JunitTest_use_jars,ridljar_uno,\ $(OUTDIR)/bin/ridl.jar \ )) diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk index 6c23ae245d57..4d27458a1cc0 100644 --- a/ridljar/JunitTest_util.mk +++ b/ridljar/JunitTest_util.mk @@ -27,7 +27,7 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_util)) -$(eval $(call gb_JunitTest_add_jars,ridljar_util,\ +$(eval $(call gb_JunitTest_use_jars,ridljar_util,\ $(OUTDIR)/bin/OOoRunnerLight.jar \ $(OUTDIR)/bin/ridl.jar \ )) diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index c8b3ac4e2ef4..9c0f1e3df231 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Executable_set_include,rsc,\ -I$(WORKDIR)/YaccTarget/rsc/source/parser \ )) -$(eval $(call gb_Executable_add_api,rsc,\ +$(eval $(call gb_Executable_use_api,rsc,\ udkapi \ offapi \ )) @@ -43,7 +43,7 @@ $(eval $(call gb_Executable_add_defs,rsc,\ -DSOLAR \ )) -$(eval $(call gb_Executable_add_linked_libs,rsc,\ +$(eval $(call gb_Executable_use_libraries,rsc,\ i18nisolang1 \ comphelper \ sal \ diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index 048bd2b1027e..f74e84753a89 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,Module_DLL,\ sal/qa/osl/module/osl_Module_DLL \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,Module_DLL,\ +$(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index 3de4fbc86aa8..6ceb12af917c 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\ sal/qa/ByteSequence/ByteSequence \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_bytesequence,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 09af305bc651..9ea1a2a7c2e7 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\ sal/qa/osl/condition/osl_Condition \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_condition,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index f3a72e2c24ee..ff46564c855e 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ sal/qa/osl/file/osl_File \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_file,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index 59bffe5c7a1f..cfbb95d89e25 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_getsystempathfromfile sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_getsystempathfromfileurl,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index ef0e550090ac..d64498a561cc 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_module,\ sal/qa/osl/module/osl_Module \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_module,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index 795f071fa5a9..cfc92f5e3253 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_mutex, \ sal/qa/osl/mutex/osl_Mutex \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_mutex, \ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 4424f25606a9..0e92b707b972 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\ sal/qa/osl/file/osl_old_test_file \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_old_test_file,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index 270610083b63..8e6b5bfe796e 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \ sal/qa/osl/pipe/osl_Pipe \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_pipe, \ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ sal \ unotest \ $(gb_STDLIBS) \ diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index aad9405714e0..60c728ab40ff 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_process,\ sal/qa/osl/process/osl_process \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_process,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 56c038d9b925..7eb2b9dc087a 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_profile, \ sal/qa/osl/profile/osl_old_testprofile \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_profile, \ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index a2495ddb767e..1e2aac169e06 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_security,\ sal/qa/osl/security/osl_Security \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_security,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index 086d116c80eb..69a350254365 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ sal/qa/osl/setthreadname/test-setthreadname \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_setthreadname, \ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index 7f27013434f4..22fdb6831355 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_thread,\ sal/qa/osl/process/osl_Thread \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_thread,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index da9333755b79..5ed812526d60 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_alloc,\ sal/qa/rtl/alloc/rtl_alloc \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_alloc,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index 05bb8d608e2c..aee5f0fe1cb7 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_cipher,\ sal/qa/rtl/cipher/rtl_cipher \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_cipher,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index ecbfa540bf66..32da6ec443c6 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_crc32,\ sal/qa/rtl/crc32/rtl_crc32 \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_crc32,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index 9d789f2d9b79..aeaa91b4f588 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_doublelock,\ sal/qa/rtl/doublelock/rtl_doublelocking \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_doublelock,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index e6f3f7033530..96d11fe389e3 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_locale,\ sal/qa/rtl/locale/rtl_locale \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_locale,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index 3e410fe1af34..09856b7d686a 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_math, \ sal/qa/rtl/math/test-rtl-math \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_math, \ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index dfb37c35ff00..721996298bb3 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_ostringbuffer,\ sal/qa/OStringBuffer/rtl_String_Utils \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_ostringbuffer,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index 23417dd8b670..570717eb559b 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_oustringbuffer,\ sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32 \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_oustringbuffer,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index fc384d62d8ea..b93d644b80d8 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -37,7 +37,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_strings,\ sal/qa/rtl/strings/test_oustring_stringliterals \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_strings,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index 8dfe9fffa0ba..d96f57c688f3 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\ sal/qa/osl/file/test_cpy_wrt_file \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_tcwf,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index f0fd6a6234d4..bc904e23c23e 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_types,\ sal/qa/sal/test_types \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sal_types,\ +$(eval $(call gb_CppunitTest_use_libraries,sal_types,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index 24beec59273b..e9d4170b58fe 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\ -I$(SRCDIR)/sal/inc \ )) -$(eval $(call gb_Executable_add_linked_libs,cppunit/cppunittester,\ +$(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index fb348fab3573..f3ce6a925ee5 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -29,7 +29,7 @@ # See qa/osl/process/osl_process.cxx:411 $(eval $(call gb_Executable_Executable,osl_process_child)) -$(eval $(call gb_Executable_add_linked_libs,osl_process_child,\ +$(eval $(call gb_Executable_use_libraries,osl_process_child,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index f54123b7b0bb..f0d3abbf59c9 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_defs,sal,\ -DSAL_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,sal,\ +$(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(GUI),UNX), \ $(if $(filter $(OS),ANDROID),, \ pthread \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 77798d82fb35..37c6cd9df0ff 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,sal_textenc)) $(eval $(call gb_Library_set_soversion_script,sal_textenc,3,$(SRCDIR)/sal/util/sal_textenc/saltextenc.map)) -$(eval $(call gb_Library_add_linked_libs,sal_textenc,\ +$(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index 6a9cf08e7d4b..2d8d04a26e1e 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,uwinapi)) -$(eval $(call gb_Library_add_linked_libs,uwinapi,\ +$(eval $(call gb_Library_use_libraries,uwinapi,\ $(if $(filter $(COM),MSC), \ kernel32 \ msvcrt \ diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index e899685185af..d2431c33c3d1 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_add_defs,salhelper,\ -DSALHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,salhelper,\ +$(eval $(call gb_Library_use_libraries,salhelper,\ sal \ $(gb_STDLIBS) \ )) diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index 7a30ddcb8111..2e141e751345 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -32,13 +32,13 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sax_cppunit, \ sax/qa/cppunit/test_converter \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \ +$(eval $(call gb_CppunitTest_use_libraries,sax_cppunit, \ sax \ sal \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_api,sax_cppunit,\ +$(eval $(call gb_CppunitTest_use_api,sax_cppunit,\ offapi \ udkapi \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index f1104cbc6825..b78642662dd5 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,expwrap,\ -I$(SRCDIR)/sax/inc \ )) -$(eval $(call gb_Library_add_api,expwrap,\ +$(eval $(call gb_Library_use_api,expwrap,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,expwrap,\ +$(eval $(call gb_Library_use_libraries,expwrap,\ cppu \ cppuhelper \ sal \ diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index b3557bd1192a..a06b27683e8a 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,fastsax,\ -I$(SRCDIR)/sax/inc \ )) -$(eval $(call gb_Library_add_api,fastsax,\ +$(eval $(call gb_Library_use_api,fastsax,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,fastsax,\ +$(eval $(call gb_Library_use_libraries,fastsax,\ cppu \ cppuhelper \ sal \ diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index a7c9fdcac946..585595aebbd4 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,sax,\ -I$(SRCDIR)/sax/inc \ )) -$(eval $(call gb_Library_add_api,sax,\ +$(eval $(call gb_Library_use_api,sax,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,sax,\ -DSAX_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,sax,\ +$(eval $(call gb_Library_use_libraries,sax,\ comphelper \ cppu \ cppuhelper \ 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 \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index 3401adbb9332..b040b2b1ea9a 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -35,13 +35,13 @@ $(eval $(call gb_Library_set_include,analysis,\ -I$(WORKDIR)/UnoApiHeaders/offapi \ )) -$(eval $(call gb_Library_add_internal_comprehensive_api,analysis,\ +$(eval $(call gb_Library_use_internal_comprehensive_api,analysis,\ offapi \ scaddins \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,analysis,\ +$(eval $(call gb_Library_use_libraries,analysis,\ cppu \ cppuhelper \ sal \ @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,analysis,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,analysis,\ +$(eval $(call gb_Library_use_libraries,analysis,\ uwinapi \ )) endif diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index 72577fed3ed5..e937ed6c7c37 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -35,13 +35,13 @@ $(eval $(call gb_Library_set_include,date,\ -I$(WORKDIR)/UnoApiHeaders/offapi \ )) -$(eval $(call gb_Library_add_internal_comprehensive_api,date,\ +$(eval $(call gb_Library_use_internal_comprehensive_api,date,\ offapi \ scaddins \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,date,\ +$(eval $(call gb_Library_use_libraries,date,\ cppu \ cppuhelper \ sal \ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 806fa779d3aa..a889f4416e8f 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,solver)) $(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver)) -$(eval $(call gb_Library_add_api,solver,\ +$(eval $(call gb_Library_use_api,solver,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,solver,\ +$(eval $(call gb_Library_use_libraries,solver,\ comphelper \ cppu \ cppuhelper \ diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk index 87902d3e284c..35caa13406d3 100644 --- a/scripting/Jar_HelloWorld.mk +++ b/scripting/Jar_HelloWorld.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,HelloWorld)) -$(eval $(call gb_Jar_add_jars,HelloWorld,\ +$(eval $(call gb_Jar_use_jars,HelloWorld,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk index 0f9a81f706fc..3ee827bf658f 100644 --- a/scripting/Jar_Highlight.mk +++ b/scripting/Jar_Highlight.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,Highlight)) -$(eval $(call gb_Jar_add_jars,Highlight,\ +$(eval $(call gb_Jar_use_jars,Highlight,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk index 952dec0dcb0b..1c3d71d7fce6 100644 --- a/scripting/Jar_MemoryUsage.mk +++ b/scripting/Jar_MemoryUsage.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,MemoryUsage)) -$(eval $(call gb_Jar_add_jars,MemoryUsage,\ +$(eval $(call gb_Jar_use_jars,MemoryUsage,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk index 1e6a4be32d49..f29e5a79ce8b 100644 --- a/scripting/Jar_ScriptFramework.mk +++ b/scripting/Jar_ScriptFramework.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,ScriptFramework)) -$(eval $(call gb_Jar_add_jars,ScriptFramework,\ +$(eval $(call gb_Jar_use_jars,ScriptFramework,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index aee4ad5d5a60..abe612596550 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell)) -$(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\ +$(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk index 19e19952c97e..bcff02d6f6f1 100644 --- a/scripting/Jar_ScriptProviderForJava.mk +++ b/scripting/Jar_ScriptProviderForJava.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJava)) -$(eval $(call gb_Jar_add_jars,ScriptProviderForJava,\ +$(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index bd405cc850e0..99ee7c31c059 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript)) -$(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\ +$(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 435f97f1c517..0bc98fd77db3 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,basprov,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_add_api,basprov,\ +$(eval $(call gb_Library_use_api,basprov,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,basprov,\ +$(eval $(call gb_Library_use_libraries,basprov,\ comphelper \ cppu \ cppuhelper \ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index d3d8a0c97f1b..93cd94183da0 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -35,13 +35,13 @@ $(eval $(call gb_Library_set_include,dlgprov,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_add_api,dlgprov,\ +$(eval $(call gb_Library_use_api,dlgprov,\ offapi \ oovbaapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,dlgprov,\ +$(eval $(call gb_Library_use_libraries,dlgprov,\ comphelper \ cppu \ cppuhelper \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index e7fcda2d0714..dcac02f836e1 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,protocolhandler,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_add_api,protocolhandler,\ +$(eval $(call gb_Library_use_api,protocolhandler,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,protocolhandler,\ +$(eval $(call gb_Library_use_libraries,protocolhandler,\ cppu \ cppuhelper \ fwe \ diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index c950acafac9c..1c3a1030ecc5 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,scriptframe,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_add_api,scriptframe,\ +$(eval $(call gb_Library_use_api,scriptframe,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,scriptframe,\ +$(eval $(call gb_Library_use_libraries,scriptframe,\ comphelper \ cppu \ cppuhelper \ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index 166a0aa83cdf..271ec3de0b7f 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,stringresource,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_add_api,stringresource,\ +$(eval $(call gb_Library_use_api,stringresource,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,stringresource,\ +$(eval $(call gb_Library_use_libraries,stringresource,\ cppu \ cppuhelper \ sal \ diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index b172258e71b7..83ec86c505c7 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -35,13 +35,13 @@ $(eval $(call gb_Library_set_include,vbaevents,\ -I$(SRCDIR)/scripting/source/inc \ )) -$(eval $(call gb_Library_add_api,vbaevents,\ +$(eval $(call gb_Library_use_api,vbaevents,\ offapi \ oovbaapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,vbaevents,\ +$(eval $(call gb_Library_use_libraries,vbaevents,\ comphelper \ cppu \ cppuhelper \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 9f55c856a52f..50f1e1191bdf 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_filters_test, \ sd/qa/unit/filters-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sd_filters_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ avmedia \ basegfx \ comphelper \ @@ -73,18 +73,18 @@ $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sd_filters_test,\ +$(eval $(call gb_CppunitTest_use_api,sd_filters_test,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sd_filters_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sd_filters_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sd_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ +$(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 1c21c0c58ed5..5d3f2e0fd36d 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_regression_test, \ sd/qa/unit/regression-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sd_regression_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ avmedia \ basegfx \ comphelper \ @@ -74,18 +74,18 @@ $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sd_regression_test,\ +$(eval $(call gb_CppunitTest_use_api,sd_regression_test,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sd_regression_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sd_regression_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sd_regression_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sd_regression_test,\ +$(eval $(call gb_CppunitTest_use_components,sd_regression_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 2bec206feebe..67691f17edd3 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -36,12 +36,12 @@ $(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\ -DSD_DLLIMPLEMENTATION \ )) -$(eval $(call gb_CppunitTest_add_api,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_api,sd_uimpress,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ avmedia \ basegfx \ canvastools \ @@ -78,11 +78,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\ $(eval $(call gb_CppunitTest_uses_ure,sd_uimpress)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sd_uimpress,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_components,sd_uimpress,\ configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk index 5d641259b58e..e2a7f7bff648 100644 --- a/sd/JunitTest_sd_unoapi.mk +++ b/sd/JunitTest_sd_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,sd_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sd/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,sd_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,sd_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index b553ca18cc10..92c85310d99e 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -67,13 +67,13 @@ $(eval $(call gb_Library_set_defs,sd,\ )) endif -$(eval $(call gb_Library_add_api,sd,\ +$(eval $(call gb_Library_use_api,sd,\ animations \ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sd,\ +$(eval $(call gb_Library_use_libraries,sd,\ avmedia \ basegfx \ canvastools \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 0c5da7480cc1..5fe3c0da4c30 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,sdd,\ -I$(SRCDIR)/sd/inc \ )) -$(eval $(call gb_Library_add_api,sdd,\ +$(eval $(call gb_Library_use_api,sdd,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdd,\ +$(eval $(call gb_Library_use_libraries,sdd,\ cppu \ cppuhelper \ sal \ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index e71c53bd20ae..327ac8b5cc8b 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,sdfilt,\ )) endif -$(eval $(call gb_Library_add_api,sdfilt,\ +$(eval $(call gb_Library_use_api,sdfilt,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdfilt,\ +$(eval $(call gb_Library_use_libraries,sdfilt,\ comphelper \ cppu \ cppuhelper \ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 8fa62561a99b..a83d9449f018 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,sdui,\ -DSD_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,sdui,\ +$(eval $(call gb_Library_use_api,sdui,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdui,\ +$(eval $(call gb_Library_use_libraries,sdui,\ basegfx \ comphelper \ cppcanvas \ 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 \ 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 \ diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index d36071493f3e..57821c5725dd 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -46,14 +46,14 @@ $(eval $(call gb_CppunitTest_set_defs,slideshow,\ )) endif -$(eval $(call gb_CppunitTest_add_api,slideshow,\ +$(eval $(call gb_CppunitTest_use_api,slideshow,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_library_objects,slideshow,slideshow)) +$(eval $(call gb_CppunitTest_use_library_objects,slideshow,slideshow)) -$(eval $(call gb_CppunitTest_add_linked_libs,slideshow,\ +$(eval $(call gb_CppunitTest_use_libraries,slideshow,\ avmedia \ basegfx \ canvastools \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 1d4cdcf059b0..07e83a845848 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -48,12 +48,12 @@ $(eval $(call gb_Executable_set_defs,demoshow,\ )) endif -$(eval $(call gb_Library_add_api,demoshow,\ +$(eval $(call gb_Library_use_api,demoshow,\ offapi \ udkapi \ )) -$(eval $(call gb_Executable_add_linked_libs,demoshow,\ +$(eval $(call gb_Executable_use_libraries,demoshow,\ basegfx \ comphelper \ cppcanvas \ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 96eef6979e4a..431b63c57323 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -43,12 +43,12 @@ $(eval $(call gb_Library_add_defs,OGLTrans,\ )) endif -$(eval $(call gb_Library_add_api,OGLTrans,\ +$(eval $(call gb_Library_use_api,OGLTrans,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ canvastools \ comphelper \ cppu \ @@ -75,14 +75,14 @@ $(eval $(call gb_Library_add_objcxxobjects,OGLTrans,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ Cocoa \ GLUT \ OpenGL \ )) else ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ gdi32 \ glu32 \ opengl32 \ @@ -101,7 +101,7 @@ $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl \ )) -$(eval $(call gb_Library_add_linked_libs,OGLTrans,\ +$(eval $(call gb_Library_use_libraries,OGLTrans,\ GL \ GLU \ X11 \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 9fcb1608b944..38b3fe2ef9b1 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -43,13 +43,13 @@ $(eval $(call gb_Library_add_defs,slideshow,\ )) endif -$(eval $(call gb_Library_add_api,slideshow,\ +$(eval $(call gb_Library_use_api,slideshow,\ animations \ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,slideshow,\ +$(eval $(call gb_Library_use_libraries,slideshow,\ avmedia \ basegfx \ canvastools \ diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 2e614b681d10..851e2e4bd1e5 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -29,12 +29,12 @@ $(eval $(call gb_CppunitTest_CppunitTest,smoketest)) $(eval $(call gb_CppunitTest_abort_on_assertion,smoketest)) -$(eval $(call gb_CppunitTest_add_api,smoketest,\ +$(eval $(call gb_CppunitTest_use_api,smoketest,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,smoketest,\ +$(eval $(call gb_CppunitTest_use_libraries,smoketest,\ cppu \ cppuhelper \ sal \ diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk index 8276cc58135a..8069efe25d35 100644 --- a/smoketest/Jar_TestExtension.mk +++ b/smoketest/Jar_TestExtension.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Jar_set_jarclasspath,TestExtension,\ unoil.jar \ )) -$(eval $(call gb_Jar_add_jars,TestExtension,\ +$(eval $(call gb_Jar_use_jars,TestExtension,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk index 80b7de0c9732..f14348e484dd 100644 --- a/smoketest/Library_smoketest.mk +++ b/smoketest/Library_smoketest.mk @@ -27,12 +27,12 @@ $(eval $(call gb_Library_Library,smoketest)) -$(eval $(call gb_Library_add_api,smoketest,\ +$(eval $(call gb_Library_use_api,smoketest,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,smoketest,\ +$(eval $(call gb_Library_use_libraries,smoketest,\ cppu \ cppuhelper \ sal \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index b81447412f62..be3c51d986f9 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -149,17 +149,32 @@ $(call gb_CppunitTest_get_target,$(1)) : URE := $(true) endef define gb_CppunitTest_add_type_rdb +$$(call gb_Output_error,\ + gb_CppunitTest_add_type_rdb: use gb_CppunitTest_use_type_rdb instead.) +endef + +define gb_CppunitTest_use_type_rdb $(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,$(2)) $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(2) endef define gb_CppunitTest_add_type_rdbs -$(foreach rdb,$(2),$(call gb_CppunitTest_add_type_rdb,$(1),$(rdb))) +$$(call gb_Output_error,\ + gb_CppunitTest_add_type_rdbs: use gb_CppunitTest_use_type_rdbs instead.) +endef + +define gb_CppunitTest_use_type_rdbs +$(foreach rdb,$(2),$(call gb_CppunitTest_use_type_rdb,$(1),$(rdb))) endef define gb_CppunitTest_add_service_rdb +$$(call gb_Output_error,\ + gb_CppunitTest_add_service_rdb: use gb_CppunitTest_use_service_rdb instead.) +endef + +define gb_CppunitTest_use_service_rdb $(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2)) $(call gb_CppunitTest_get_target,$(1)) : \ UNO_SERVICES += $(call gb_RdbTarget_get_target,$(2)) @@ -167,11 +182,21 @@ $(call gb_CppunitTest_get_target,$(1)) : \ endef define gb_CppunitTest_add_service_rdbs -$(foreach rdb,$(2),$(call gb_CppunitTest_add_service_rdb,$(1),$(rdb))) +$$(call gb_Output_error,\ + gb_CppunitTest_add_service_rdbs: use gb_CppunitTest_use_service_rdbs instead.) +endef + +define gb_CppunitTest_use_service_rdbs +$(foreach rdb,$(2),$(call gb_CppunitTest_use_service_rdb,$(1),$(rdb))) endef define gb_CppunitTest_add_component +$$(call gb_Output_error,\ + gb_CppunitTest_add_component: use gb_CppunitTest_use_component instead.) +endef + +define gb_CppunitTest_use_component $(call gb_CppunitTest_get_target,$(1)) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_CppunitTest_get_target,$(1)) : \ @@ -194,11 +219,21 @@ $(filter-out \ endef define gb_CppunitTest_add_components -$(foreach component,$(call gb_CppunitTest__filter_not_built_components,$(2)),$(call gb_CppunitTest_add_component,$(1),$(component))) +$$(call gb_Output_error,\ + gb_CppunitTest_add_components: use gb_CppunitTest_use_components instead.) +endef + +define gb_CppunitTest_use_components +$(foreach component,$(call gb_CppunitTest__filter_not_built_components,$(2)),$(call gb_CppunitTest_use_component,$(1),$(component))) endef define gb_CppunitTest_add_old_component +$$(call gb_Output_error,\ + gb_CppunitTest_add_old_component: use gb_CppunitTest_use_old_component instead.) +endef + +define gb_CppunitTest_use_old_component $(call gb_CppunitTest_get_target,$(1)) : \ $(call gb_CppunitTest__get_old_component_target,$(2)) $(call gb_CppunitTest_get_target,$(1)) : \ @@ -207,7 +242,12 @@ $(call gb_CppunitTest_get_target,$(1)) : \ endef define gb_CppunitTest_add_old_components -$(foreach component,$(2),$(call gb_CppunitTest_add_old_component,$(1),$(component))) +$$(call gb_Output_error,\ + gb_CppunitTest_add_old_components: use gb_CppunitTest_use_old_components instead.) +endef + +define gb_CppunitTest_use_old_components +$(foreach component,$(2),$(call gb_CppunitTest_use_old_component,$(1),$(component))) endef @@ -220,15 +260,20 @@ endef $(eval $(foreach method,\ add_api \ + use_api \ add_cobject \ add_cobjects \ add_cxxobject \ add_cxxobjects \ add_exception_objects \ add_executable_objects \ + use_executable_objects \ add_library_objects \ + use_library_objects \ add_linked_libs \ + use_libraries \ add_linked_static_libs \ + use_static_libraries \ add_noexception_objects \ add_objcobject \ add_objcobjects \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 174ddb662216..3089924c4ccc 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -105,14 +105,21 @@ $(eval $(foreach method,\ add_libs \ set_library_path_flags \ add_api \ + use_api \ add_internal_api \ + use_internal_api \ add_internal_bootstrap_api \ + use_internal_bootstrap_api \ add_internal_comprehensive_api \ + use_internal_comprehensive_api \ add_linked_libs \ + use_libraries \ add_linked_static_libs \ + use_static_libraries \ use_external \ use_externals \ add_custom_headers \ + use_custom_headers \ add_package_headers \ add_sdi_headers \ add_nativeres \ diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 80112272f752..202521e4e74f 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -194,12 +194,22 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) endef define gb_Extension_add_package_dependency +$$(call gb_Output_error,\ + gb_Extension_add_package_dependency: use gb_Extension_use_package instead.) +endef + +define gb_Extension_use_package $(call gb_Extension_get_target,$(1)) : $(call gb_Package_get_target,$(2)) endef define gb_Extension_add_package_dependencies -$(foreach package,$(2),$(call gb_Extension_add_package_dependency,$(1),$(package))) +$$(call gb_Output_error,\ + gb_Extension_add_package_dependencies: use gb_Extension_use_packages instead.) +endef + +define gb_Extension_use_packages +$(foreach package,$(2),$(call gb_Extension_use_package,$(1),$(package))) endef diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 9efc1e704e31..393d25fc94d6 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -169,25 +169,45 @@ $(call gb_Jar_get_target,$(1)) : $(2) endef -# remember: classpath is "inherited" to ClassSet define gb_Jar_add_jar -$(call gb_JavaClassSet_add_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_Jar_add_jar: use gb_Jar_use_jar instead.) +endef + +# remember: classpath is "inherited" to ClassSet +define gb_Jar_use_jar +$(call gb_JavaClassSet_use_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef define gb_Jar_add_system_jar -$(call gb_JavaClassSet_add_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_Jar_add_system_jar: use gb_Jar_use_system_jar instead.) +endef + +define gb_Jar_use_system_jar +$(call gb_JavaClassSet_use_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef -# specify jars with imported modules define gb_Jar_add_jars -$(call gb_JavaClassSet_add_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_Jar_add_jars: use gb_Jar_use_jars instead.) +endef + +# specify jars with imported modules +define gb_Jar_use_jars +$(call gb_JavaClassSet_use_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef define gb_Jar_add_system_jars -$(call gb_JavaClassSet_add_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_Jar_add_system_jars: use gb_Jar_use_system_jars instead.) +endef + +define gb_Jar_use_system_jars +$(call gb_JavaClassSet_use_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef @@ -202,22 +222,42 @@ $(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef define gb_Jar_add_customtarget_dependency -$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_Jar_add_customtarget_dependency: use gb_Jar_use_customtarget instead.) +endef + +define gb_Jar_use_customtarget +$(call gb_JavaClassSet_use_customtarget,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef define gb_Jar_add_customtarget_dependencies -$(foreach customtarget,$(2),$(call gb_Jar_add_customtarget_dependency,$(1),$(customtarget))) +$$(call gb_Output_error,\ + gb_Jar_add_customtarget_dependencies: use gb_Jar_use_customtargets instead.) +endef + +define gb_Jar_use_customtargets +$(foreach customtarget,$(2),$(call gb_Jar_use_customtarget,$(1),$(customtarget))) endef define gb_Jar_add_package_dependency -$(call gb_JavaClassSet_add_package_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_Jar_add_package_dependency: use gb_Jar_use_package instead.) +endef + +define gb_Jar_use_package +$(call gb_JavaClassSet_use_package,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef define gb_Jar_add_package_dependencies -$(foreach package,$(2),$(call gb_Jar_add_package_dependency,$(1),$(package))) +$$(call gb_Output_error,\ + gb_Jar_add_package_dependencies: use gb_Jar_use_packages instead.) +endef + +define gb_Jar_use_packages +$(foreach package,$(2),$(call gb_Jar_use_package,$(1),$(package))) endef diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index df96284734ce..35ab6d7314af 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -106,9 +106,14 @@ $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2) endef +define gb_JavaClassSet_add_jar +$$(call gb_Output_error,\ + gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.) +endef + # problem: currently we can't get these dependencies to work # build order dependency is a hack to get these prerequisites out of the way in the build command -define gb_JavaClassSet_add_jar +define gb_JavaClassSet_use_jar $(call gb_JavaClassSet_get_target,$(1)) : $(2) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(strip $(2)) @@ -118,27 +123,47 @@ endef # this does not generate dependency on the jar define gb_JavaClassSet_add_system_jar +$$(call gb_Output_error,\ + gb_JavaClassSet_add_system_jar: use gb_JavaClassSet_use_system_jar instead.) +endef + +define gb_JavaClassSet_use_system_jar $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(strip $(2)) endef define gb_JavaClassSet_add_jars -$(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar))) +$$(call gb_Output_error,\ + gb_JavaClassSet_add_jars: use gb_JavaClassSet_use_jars instead.) +endef + +define gb_JavaClassSet_use_jars +$(foreach jar,$(2),$(call gb_JavaClassSet_use_jar,$(1),$(jar))) endef define gb_JavaClassSet_add_system_jars -$(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar))) +$$(call gb_Output_error,\ + gb_JavaClassSet_add_system_jars: use gb_JavaClassSet_use_system_jars instead.) +endef + +define gb_JavaClassSet_use_system_jars +$(foreach jar,$(2),$(call gb_JavaClassSet_use_system_jar,$(1),$(jar))) endef -# gb_JavaClassSet_add_jar_classset: Like gb_JavaClassSet_add_jar, but instead of +define gb_JavaClassSet_add_jar_classset +$$(call gb_Output_error,\ + gb_JavaClassSet_add_jar_classset: use gb_JavaClassSet_use_jar_classset instead.) +endef + +# gb_JavaClassSet_use_jar_classset: Like gb_JavaClassSet_use_jar, but instead of # using the jar, use the directory tree with the class files that make up the # jar. This is sometimes necessary in JunitTests that have test classes in # packages that belong to a sealed jar. # $1: token identifying this JavaClassSet # $2: token identifying the Jar being used -define gb_JavaClassSet_add_jar_classset +define gb_JavaClassSet_use_jar_classset $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2))) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2))) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) @@ -160,14 +185,24 @@ $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) endef define gb_JavaClassSet_add_customtarget_dependency +$$(call gb_Output_error,\ + gb_JavaClassSet_add_customtarget_dependency: use gb_JavaClassSet_use_customtarget instead.) +endef + +define gb_JavaClassSet_use_customtarget $(call gb_JavaClassSet_get_preparation_target,$(1)) : \ $(call gb_CustomTarget_get_target,$(2)) endef define gb_JavaClassSet_add_package_dependency +$$(call gb_Output_error,\ + gb_JavaClassSet_add_package_dependency: use gb_JavaClassSet_use_package instead.) +endef + +define gb_JavaClassSet_use_package $(call gb_JavaClassSet_get_preparation_target,$(1)) : \ - $(call gb_Package_get_target,$(2)) + $(call gb_Package_get_target,$(2)) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index c861ea08b1ec..187b0678424e 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -73,7 +73,7 @@ $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1))) -$(call gb_JavaClassSet_add_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR)) +$(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR)) $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1))) $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1)))) endef @@ -105,7 +105,12 @@ $(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile)) endef define gb_JunitTest_add_jar -$(call gb_JavaClassSet_add_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_JunitTest_add_jar: use gb_JunitTest_use_jar instead.) +endef + +define gb_JunitTest_use_jar +$(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2) $(call gb_JunitTest_get_target,$(1)) : $(2) $(2) :| $(gb_Helper_PHONY) @@ -113,34 +118,64 @@ $(2) :| $(gb_Helper_PHONY) endef define gb_JunitTest_add_jars -$(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar))) +$$(call gb_Output_error,\ + gb_JunitTest_add_jars: use gb_JunitTest_use_jars instead.) +endef + +define gb_JunitTest_use_jars +$(foreach jar,$(2),$(call gb_JunitTest_use_jar,$(1),$(jar))) endef -# see gb_JavaClassSet_add_jar_classset define gb_JunitTest_add_jar_classset -$(call gb_JavaClassSet_add_jar_classset,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_JunitTest_add_jar_classset: use gb_JunitTest_use_jar_classset instead.) +endef + +# see gb_JavaClassSet_use_jar_classset +define gb_JunitTest_use_jar_classset +$(call gb_JavaClassSet_use_jar_classset,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) endef define gb_JunitTest_add_customtarget_dependency -$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_JunitTest_add_customtarget_dependency: use gb_Jar_use_customtarget instead.) +endef + +define gb_JunitTest_use_customtarget +$(call gb_JavaClassSet_use_customtarget,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) endef define gb_JunitTest_add_customtarget_dependencies -$(foreach dependency,$(2),$(call gb_JunitTest_add_customtarget_dependency,$(1),$(dependency))) +$$(call gb_Output_error,\ + gb_JunitTest_add_customtarget_dependencies: use gb_Jar_use_customtargets instead.) +endef + +define gb_JunitTest_use_customtargets +$(foreach dependency,$(2),$(call gb_JunitTest_use_customtarget,$(1),$(dependency))) endef define gb_JunitTest_add_package_dependency -$(call gb_JavaClassSet_add_package_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$$(call gb_Output_error,\ + gb_JunitTest_add_package_dependency: use gb_JunitTest_use_package instead.) +endef + +define gb_JunitTest_use_package +$(call gb_JavaClassSet_use_package,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) endef define gb_JunitTest_add_package_dependencies -$(foreach dependency,$(2),$(call gb_JunitTest_add_package_dependency,$(1),$(dependency))) +$$(call gb_Output_error,\ + gb_JunitTest_add_package_dependencies: use gb_JunitTest_use_packages instead.) +endef + +define gb_JunitTest_use_packages +$(foreach dependency,$(2),$(call gb_JunitTest_use_package,$(1),$(dependency))) endef @@ -160,13 +195,13 @@ gb_JunitTest_add_classes := gb_JunitTest_add_class := gb_JunitTest_add_sourcefile := gb_JunitTest_add_sourcefiles := -gb_JunitTest_add_jar := -gb_JunitTest_add_jars := -gb_JunitTest_add_jar_classset := -gb_JunitTest_add_customtarget_dependency := -gb_JunitTest_add_customtarget_dependencies := -gb_JunitTest_add_package_dependency := -gb_JunitTest_add_package_dependencies := +gb_JunitTest_use_jar := +gb_JunitTest_use_jars := +gb_JunitTest_use_jar_classset := +gb_JunitTest_use_customtarget := +gb_JunitTest_use_customtargets := +gb_JunitTest_use_package := +gb_JunitTest_use_packages := endif # OOO_JUNIT_JAR # vim: set noet sw=4: diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 358a8e6aa6f8..177e07f3f9aa 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -101,7 +101,7 @@ $(call gb_Library__set_soversion_script_platform,$(1),$(2),$(3)) endef # The dependency from workdir component target to outdir library should ensure -# that gb_CppunitTest_add_component can transitively depend on the library. +# that gb_CppunitTest_use_component can transitively depend on the library. # But the component target also must be delivered, so a new phony target # gb_Library__get_final_target has been invented for that purpose... define gb_Library_set_componentfile @@ -163,6 +163,7 @@ $(eval $(foreach method,\ add_generated_cxxobjects \ add_generated_exception_objects \ add_library_objects \ + use_library_objects \ add_grammar \ add_grammars \ add_cflags \ @@ -181,15 +182,23 @@ $(eval $(foreach method,\ add_libs \ set_library_path_flags \ add_api \ + use_api \ add_internal_api \ + use_internal_api \ add_internal_bootstrap_api \ + use_internal_bootstrap_api \ add_internal_comprehensive_api \ + use_internal_comprehensive_api \ add_linked_libs \ + use_libraries \ add_linked_static_libs \ + use_static_libraries \ use_external \ use_externals \ add_custom_headers \ + use_custom_headers \ add_external_headers \ + use_package \ add_package_headers \ add_sdi_headers \ export_objects_list \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 02d51a34ce4e..b56456e6df0f 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -601,6 +601,11 @@ $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) endef define gb_LinkTarget_add_api +$$(call gb_Output_error,\ + gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.) +endef + +define gb_LinkTarget_use_api $(call gb_LinkTarget_get_external_headers_target,$(1)) :| \ $$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc)) $(call gb_LinkTarget_get_headers_target,$(1)) \ @@ -611,7 +616,7 @@ endif endef -define gb_LinkTarget__add_internal_api_one +define gb_LinkTarget__use_internal_api_one $(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api)) @@ -621,27 +626,48 @@ endif endef -define gb_LinkTarget__add_internal_api -$(foreach api,$(2),$(call gb_LinkTarget__add_internal_api_one,$(1),$(api),$(3))) +define gb_LinkTarget__use_internal_api +$(foreach api,$(2),$(call gb_LinkTarget__use_internal_api_one,$(1),$(api),$(3))) endef define gb_LinkTarget_add_internal_api -$(call gb_LinkTarget__add_internal_api,$(1),$(2)) - +$$(call gb_Output_error,\ + gb_LinkTarget_add_internal_api: use gb_LinkTarget_use_internal_api instead.) endef define gb_LinkTarget_add_internal_bootstrap_api -$(call gb_LinkTarget__add_internal_api,$(1),$(2),bootstrap_) - +$$(call gb_Output_error,\ + gb_LinkTarget_add_internal_bootstrap_api: use gb_LinkTarget_use_internal_bootstrap_api instead.) endef define gb_LinkTarget_add_internal_comprehensive_api -$(call gb_LinkTarget__add_internal_api,$(1),$(2),comprehensive_) +$$(call gb_Output_error,\ + gb_LinkTarget_add_internal_comprehensive_api: use gb_LinkTarget_use_internal_comprehensive_api instead.) +endef + + +define gb_LinkTarget_use_internal_api +$(call gb_LinkTarget__use_internal_api,$(1),$(2)) + +endef + +define gb_LinkTarget_use_internal_bootstrap_api +$(call gb_LinkTarget__use_internal_api,$(1),$(2),bootstrap_) + +endef + +define gb_LinkTarget_use_internal_comprehensive_api +$(call gb_LinkTarget__use_internal_api,$(1),$(2),comprehensive_) endef define gb_LinkTarget_add_linked_libs +$$(call gb_Output_error,\ + gb_LinkTarget_add_linked_libs: use gb_LinkTarget_use_libraries instead.) +endef + +define gb_LinkTarget_use_libraries ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) $$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) @@ -660,6 +686,11 @@ $$(foreach lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_headers_target,$$(lib)) endef define gb_LinkTarget_add_linked_static_libs +$$(call gb_Output_error,\ + gb_LinkTarget_add_linked_static_libs: use gb_LinkTarget_use_static_libraries instead.) +endef + +define gb_LinkTarget_use_static_libraries ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2))) $$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL)) $$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk)) @@ -674,6 +705,12 @@ $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib))) endef define gb_LinkTarget_add_linked_static_external_libs +$$(call gb_Output_error,\ + gb_LinkTarget_add_linked_static_external_libs: use gb_LinkTarget_use_static_external_libraries instead.) +endef + +# TODO: why do we need this? +define gb_LinkTarget_use_static_external_libraries $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2) @@ -835,11 +872,12 @@ define gb_LinkTarget_add_exception_object $(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(CXXFLAGS)) endef -define gb_LinkTarget_add_cobjects -$(foreach obj,$(2),$(call gb_LinkTarget_add_cobject,$(1),$(obj),$(3))) +define gb_LinkTarget_add_linktarget_objects +$$(call gb_Output_error,\ + gb_LinkTarget_add_linktarget_objects: use gb_LinkTarget__use_linktarget_objects instead.) endef -define gb_LinkTarget_add_linktarget_objects +define gb_LinkTarget__use_linktarget_objects $(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget))) ifneq ($(OS),IOS) $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget))) @@ -848,19 +886,33 @@ endif endef define gb_LinkTarget_add_library_objects +$$(call gb_Output_error,\ + gb_LinkTarget_add_library_objects: use gb_LinkTarget_use_library_objects instead.) +endef + +define gb_LinkTarget_use_library_objects ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) $$(eval $$(call gb_Output_error,Cannot import objects library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) endif -$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib)))) +$(call gb_LinkTarget__use_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib)))) endef define gb_LinkTarget_add_executable_objects -$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach exe,$(2),$(call gb_Executable_get_linktargetname,$(lib)))) +$$(call gb_Output_error,\ + gb_LinkTarget_add_executable_objects: use gb_LinkTarget_use_executable_objects instead.) +endef + +define gb_LinkTarget_use_executable_objects +$(call gb_LinkTarget__use_linktarget_objects,$(1),$(foreach exe,$(2),$(call gb_Executable_get_linktargetname,$(lib)))) endef +define gb_LinkTarget_add_cobjects +$(foreach obj,$(2),$(call gb_LinkTarget_add_cobject,$(1),$(obj),$(3))) +endef + define gb_LinkTarget_add_cxxobjects $(foreach obj,$(2),$(call gb_LinkTarget_add_cxxobject,$(1),$(obj),$(3))) endef @@ -937,7 +989,12 @@ $(2) :| $(call gb_LinkTarget_get_external_headers_target,$(1)) endef -define gb_LinkTarget__add_custom_headers +define gb_LinkTarget_add_custom_headers +$$(call gb_Output_error,\ + gb_LinkTarget_add_custom_headers: use gb_LinkTarget_use_custom_headers instead.) +endef + +define gb_LinkTarget__use_custom_headers $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) ifeq ($(gb_FULLDEPS),$(true)) @@ -948,8 +1005,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_t endef -define gb_LinkTarget_add_custom_headers -$(foreach customtarget,$(2),$(call gb_LinkTarget__add_custom_headers,$(1),$(customtarget))) +define gb_LinkTarget_use_custom_headers +$(foreach customtarget,$(2),$(call gb_LinkTarget__use_custom_headers,$(1),$(customtarget))) endef @@ -959,12 +1016,19 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_P endef +# add SDI (svidl) headers define gb_LinkTarget_add_sdi_headers $(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_SdiTarget_get_target,$(sdi)))) $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi))) endef define gb_LinkTarget_add_external_headers +$$(call gb_Output_error,\ + gb_LinkTarget_add_external_headers: use gb_LinkTarget_use_package instead.) +endef + +# use a header package, possibly from another module (i.e. via OUTDIR) +define gb_LinkTarget_use_package $(call gb_LinkTarget_get_headers_target,$(1) : |$(call gb_Package_get_target,$(2))) endef diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 20588396e76f..ce79dfa789b1 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -80,7 +80,6 @@ gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary_get_ endef $(eval $(foreach method,\ - add_api \ add_cobject \ add_cobjects \ add_cxxobject \ @@ -107,11 +106,16 @@ $(eval $(foreach method,\ set_ldflags \ add_libs \ set_library_path_flags \ + add_api \ + use_api \ add_linked_libs \ + use_libraries \ add_linked_static_libs \ + use_static_libraries \ use_external \ use_externals \ add_custom_headers \ + use_custom_headers \ add_package_headers \ add_sdi_headers \ set_warnings_not_errors \ diff --git a/solenv/gbuild/templates/CppunitTest.mk b/solenv/gbuild/templates/CppunitTest.mk index 28e940688019..bb27513578b4 100644 --- a/solenv/gbuild/templates/CppunitTest.mk +++ b/solenv/gbuild/templates/CppunitTest.mk @@ -30,7 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME)) $(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \ +$(eval $(call gb_CppunitTest_use_libraries,MODULE_NAME, \ $(gb_STDLIBS) \ )) diff --git a/solenv/gbuild/templates/Executable.mk b/solenv/gbuild/templates/Executable.mk index 5a11ca65a055..9303e757b6fd 100644 --- a/solenv/gbuild/templates/Executable.mk +++ b/solenv/gbuild/templates/Executable.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_set_include,EXEC,\ # -Dfoo \ #)) -$(eval $(call gb_Executable_add_linked_libs,EXEC,\ +$(eval $(call gb_Executable_use_libraries,EXEC,\ $(gb_STDLIBS) \ )) diff --git a/solenv/gbuild/templates/JunitTest.mk b/solenv/gbuild/templates/JunitTest.mk index d4e515fa2d8e..9a086dac3b57 100644 --- a/solenv/gbuild/templates/JunitTest.mk +++ b/solenv/gbuild/templates/JunitTest.mk @@ -32,7 +32,7 @@ $(eval $(call gb_JunitTest_set_defs,MODULE_TYPE,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \ )) -$(eval $(call gb_JunitTest_add_jars,MODULE_TYPE,\ +$(eval $(call gb_JunitTest_use_jars,MODULE_TYPE,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk index 164617b28349..972ab8273428 100644 --- a/solenv/gbuild/templates/Library.mk +++ b/solenv/gbuild/templates/Library.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Library_set_include,LIB,\ # add libraries to be linked to LIB; again these names need to be given as # specified in Repository.mk -$(eval $(call gb_Library_add_linked_libs,LIB,\ +$(eval $(call gb_Library_use_libraries,LIB,\ $(gb_STDLIBS) \ )) diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 41f538f75a57..1af4eef0ca01 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -36,7 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sot_test_sot, \ sot/qa/cppunit/test_sot \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sot_test_sot, \ +$(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ comphelper \ cppu \ cppuhelper \ @@ -51,14 +51,14 @@ $(eval $(call gb_CppunitTest_set_include,sot_test_sot,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sot_test_sot,\ +$(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sot_test_sot)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sot_test_sot,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sot_test_sot,\ types \ )) diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk index a1a6d359d655..afa8c739802e 100644 --- a/sot/JunitTest_sot_complex.mk +++ b/sot/JunitTest_sot_complex.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\ sot/qa/complex/olesimplestorage/TestHelper \ )) -$(eval $(call gb_JunitTest_add_jars,sot_complex,\ +$(eval $(call gb_JunitTest_use_jars,sot_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index cc5271d1d33f..124c59277cec 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,sot,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,sot,\ +$(eval $(call gb_Library_use_api,sot,\ udkapi \ offapi \ )) @@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_defs,sot,\ -DSOT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,sot,\ +$(eval $(call gb_Library_use_libraries,sot,\ comphelper \ cppu \ cppuhelper \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index c33a99e28000..fd65302353d2 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ -I$(SRCDIR)/starmath/inc \ )) -$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\ offapi \ udkapi \ )) @@ -42,13 +42,13 @@ $(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\ -DSMDLL \ )) -$(eval $(call gb_CppunitTest_add_library_objects,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\ sm \ )) $(call gb_CxxObject_get_target,starmath/qa/cppunit/test_starmath): $(WORKDIR)/AllLangRes/sm -$(eval $(call gb_CppunitTest_add_linked_libs,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\ comphelper \ cppu \ cppuhelper \ @@ -77,11 +77,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\ $(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit)) -$(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,starmath_qa_cppunit,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\ configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ @@ -89,13 +89,13 @@ $(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\ sfx2/util/sfx \ )) -$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\ component/vcl/vcl \ mcnttype \ )) ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\ +$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\ ftransl \ sysdtrans \ )) diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk index c70699f44a8f..b021c50d77a4 100644 --- a/starmath/JunitTest_sm_unoapi.mk +++ b/starmath/JunitTest_sm_unoapi.mk @@ -34,7 +34,7 @@ $(eval $(call gb_JunitTest_set_defs,sm_unoapi,\ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \ )) -$(eval $(call gb_JunitTest_add_jars,sm_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,sm_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk index a59c6669ff1a..13194ad92ab2 100644 --- a/starmath/JunitTest_starmath_unoapi.mk +++ b/starmath/JunitTest_starmath_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/starmath/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,starmath_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,starmath_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 891a07377a1e..bd13669c33c8 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,sm,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,sm,\ +$(eval $(call gb_Library_use_api,sm,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sm,\ +$(eval $(call gb_Library_use_libraries,sm,\ comphelper \ cppu \ cppuhelper \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 12b035f1b20c..3e36ddf85179 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,smd,\ -I$(SRCDIR)/starmath/inc \ )) -$(eval $(call gb_Library_add_api,smd,\ +$(eval $(call gb_Library_use_api,smd,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,smd,\ +$(eval $(call gb_Library_use_libraries,smd,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 490139bfa421..efdaf4e26177 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -48,11 +48,11 @@ $(eval $(call gb_Library_set_include,bootstrap,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_internal_bootstrap_api,bootstrap,\ +$(eval $(call gb_Library_use_internal_bootstrap_api,bootstrap,\ bootstrap \ )) -$(eval $(call gb_Library_add_linked_libs,bootstrap,\ +$(eval $(call gb_Library_use_libraries,bootstrap,\ cppu \ cppuhelper \ reg \ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index 1e9c97b42a01..2ef9c387a40a 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,introspection,\ +$(eval $(call gb_Library_use_internal_api,introspection,\ insp \ )) -$(eval $(call gb_Library_add_linked_libs,introspection,\ +$(eval $(call gb_Library_use_libraries,introspection,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 1c5905071bf7..356522cbfc78 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,invocadapt,\ +$(eval $(call gb_Library_use_internal_api,invocadapt,\ invadp \ )) -$(eval $(call gb_Library_add_linked_libs,invocadapt,\ +$(eval $(call gb_Library_use_libraries,invocadapt,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index 92ac438477d2..b73e22c7b18e 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,invocation,\ +$(eval $(call gb_Library_use_internal_api,invocation,\ inv \ )) -$(eval $(call gb_Library_add_linked_libs,invocation,\ +$(eval $(call gb_Library_use_libraries,invocation,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 8c672d29f54d..8855eae4911a 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,javaloader,\ +$(eval $(call gb_Library_use_internal_api,javaloader,\ javaloader \ )) -$(eval $(call gb_Library_add_linked_libs,javaloader,\ +$(eval $(call gb_Library_use_libraries,javaloader,\ cppu \ cppuhelper \ jvmaccess \ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index 2095def49dda..6cfc674f6787 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,javavm,\ +$(eval $(call gb_Library_use_internal_api,javavm,\ jen \ )) -$(eval $(call gb_Library_add_linked_libs,javavm,\ +$(eval $(call gb_Library_use_libraries,javavm,\ cppu \ cppuhelper \ jvmaccess \ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index eaa4d7080c59..68747b08c595 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,namingservice,\ +$(eval $(call gb_Library_use_internal_api,namingservice,\ namingservice \ )) -$(eval $(call gb_Library_add_linked_libs,namingservice,\ +$(eval $(call gb_Library_use_libraries,namingservice,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index fe1293beff29..ce3b23b2a830 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,proxyfac,\ +$(eval $(call gb_Library_use_internal_api,proxyfac,\ proxyfac \ )) -$(eval $(call gb_Library_add_linked_libs,proxyfac,\ +$(eval $(call gb_Library_use_libraries,proxyfac,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index c56bf0a88a2b..c14aaad31b03 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,reflection,\ +$(eval $(call gb_Library_use_internal_api,reflection,\ corefl \ )) -$(eval $(call gb_Library_add_linked_libs,reflection,\ +$(eval $(call gb_Library_use_libraries,reflection,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 6fb777ee65fd..6a0b5c667eef 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -42,11 +42,11 @@ $(eval $(call gb_Library_set_include,stocservices,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_internal_api,stocservices,\ +$(eval $(call gb_Library_use_internal_api,stocservices,\ stocserv \ )) -$(eval $(call gb_Library_add_linked_libs,stocservices,\ +$(eval $(call gb_Library_use_libraries,stocservices,\ cppu \ cppuhelper \ sal \ diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index e34cb9c27639..fd090143c092 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -33,7 +33,7 @@ svl/qa/unit/test_lngmisc \ )) # add a list of all needed libraries here -$(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \ +$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ cppu \ cppuhelper \ sal \ @@ -43,7 +43,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \ )) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \ +$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ oleaut32 \ )) endif diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index 8f5f3adb4d2b..e8c4132149b3 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -28,12 +28,12 @@ $(eval $(call gb_CppunitTest_CppunitTest,svl_urihelper)) -$(eval $(call gb_CppunitTest_add_api,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_api,svl_urihelper, \ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_components,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_components,svl_urihelper, \ ucb/source/core/ucb1 \ )) @@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svl_urihelper, \ svl/qa/unit/test_URIHelper \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ cppu \ cppuhelper \ sal \ @@ -51,7 +51,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,svl_urihelper, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_type_rdbs,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_type_rdbs,svl_urihelper, \ types \ )) diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk index 257e4e4d0ebb..7ee0f4c2880e 100644 --- a/svl/JunitTest_svl_complex.mk +++ b/svl/JunitTest_svl_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,svl_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svl/qa/complex/broken_document/test_documents \ )) -$(eval $(call gb_JunitTest_add_jars,svl_complex,\ +$(eval $(call gb_JunitTest_use_jars,svl_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 77d826c98b16..c4683a2c75b4 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_set_include,fsstorage,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,fsstorage,\ +$(eval $(call gb_Library_use_api,fsstorage,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,fsstorage,\ +$(eval $(call gb_Library_use_libraries,fsstorage,\ comphelper \ cppu \ cppuhelper \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 6ece5a37cda5..aa3a940bfaf9 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,passwordcontainer,\ +$(eval $(call gb_Library_use_api,passwordcontainer,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ +$(eval $(call gb_Library_use_libraries,passwordcontainer,\ cppu \ cppuhelper \ sal \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 5addf898fe82..a4f06c18df1b 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,svl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,svl,\ +$(eval $(call gb_Library_use_api,svl,\ udkapi \ offapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,svl,\ -DSVL_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,svl,\ +$(eval $(call gb_Library_use_libraries,svl,\ basegfx \ comphelper \ cppu \ diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index 15fac3390d78..671fb3ded20f 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svtools_filters_test, \ svtools/qa/cppunit/filters-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,svtools_filters_test, \ +$(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \ comphelper \ cppu \ cppuhelper \ @@ -48,18 +48,18 @@ $(eval $(call gb_CppunitTest_set_include,svtools_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,svtools_filters_test,\ +$(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\ udkapi \ offapi \ )) $(eval $(call gb_CppunitTest_uses_ure,svtools_filters_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,svtools_filters_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,svtools_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,svtools_filters_test,\ +$(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\ configmgr/source/configmgr \ )) diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index 428a5a14157a..e664c2c257cc 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Executable_set_include,bmp,\ -I$(SRCDIR)/svtools/source/inc \ )) -$(eval $(call gb_Executable_add_api,bmp,\ +$(eval $(call gb_Executable_use_api,bmp,\ udkapi \ offapi \ )) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ +$(eval $(call gb_Executable_use_libraries,bmp,\ sal \ comphelper \ tl \ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index 569281a3e492..8d03b5768d9d 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,bmpsum,\ -I$(SRCDIR)/svtools/inc/svtools \ )) -$(eval $(call gb_Executable_add_api,bmpsum,\ +$(eval $(call gb_Executable_use_api,bmpsum,\ udkapi \ offapi \ )) -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ +$(eval $(call gb_Executable_use_libraries,bmpsum,\ sal \ comphelper \ tl \ diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index 656aad97e3f9..7c2193f5538a 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,g2g,\ -I$(SRCDIR)/svtools/inc/svtools \ )) -$(eval $(call gb_Executable_add_api,g2g,\ +$(eval $(call gb_Executable_use_api,g2g,\ udkapi \ offapi \ )) -$(eval $(call gb_Executable_add_linked_libs,g2g,\ +$(eval $(call gb_Executable_use_libraries,g2g,\ jvmfwk \ sal \ svt \ diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk index 386b06f9d885..b79728d5408b 100644 --- a/svtools/JunitTest_svtools_unoapi.mk +++ b/svtools/JunitTest_svtools_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svtools/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,svtools_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,svtools_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index 25f696998598..fd89a7dd4933 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\ -I$(SRCDIR)/svtools/inc \ )) -$(eval $(call gb_Library_add_api,hatchwindowfactory,\ +$(eval $(call gb_Library_use_api,hatchwindowfactory,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ +$(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ cppu \ cppuhelper \ sal \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 55b651506d61..73f1e212319d 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt)) -$(eval $(call gb_Library_add_api,svt,\ +$(eval $(call gb_Library_use_api,svt,\ udkapi \ offapi \ )) @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,svt,\ -DSVT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,svt,\ +$(eval $(call gb_Library_use_libraries,svt,\ basegfx \ comphelper \ cppu \ @@ -274,7 +274,7 @@ $(eval $(call gb_Library_add_cobjects,svt,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,svt,\ +$(eval $(call gb_Library_use_libraries,svt,\ advapi32 \ gdi32 \ ole32 \ diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index dbd78183d380..61fe0505a9f3 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\ $$(CXXFLAGS) \ )) -$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ +$(eval $(call gb_Executable_use_libraries,$(gengalbin),\ sal \ tl \ svl \ @@ -65,12 +65,12 @@ $(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\ svx/source/gengal/gengal \ )) -$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\ +$(eval $(call gb_Executable_use_static_libraries,$(gengalbin),\ vclmain \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ +$(eval $(call gb_Executable_use_libraries,$(gengalbin),\ kernel32 \ msvcrt \ $(gb_Library_win32_OLDNAMES) \ @@ -80,7 +80,7 @@ $(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ +$(eval $(call gb_Executable_use_libraries,$(gengalbin),\ dl \ pthread \ )) diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk index 5fa78c0a0d68..9266f9ede569 100644 --- a/svx/JunitTest_svx_unoapi.mk +++ b/svx/JunitTest_svx_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,svx_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svx/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,svx_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,svx_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 2e3e4d80fb79..ba8ffa181b61 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,svx,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,svx,\ +$(eval $(call gb_Library_use_api,svx,\ udkapi \ offapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,svx,\ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) -$(eval $(call gb_Library_add_linked_libs,svx,\ +$(eval $(call gb_Library_use_libraries,svx,\ basegfx \ sb \ comphelper \ @@ -224,7 +224,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ )) else ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,svx,\ +$(eval $(call gb_Library_use_libraries,svx,\ advapi32 \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 38145872f016..c1565f10202c 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_add_package_headers,svxcore,\ svx_sdi \ )) -$(eval $(call gb_Library_add_api,svxcore,\ +$(eval $(call gb_Library_use_api,svxcore,\ udkapi \ offapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_defs,svxcore,\ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) -$(eval $(call gb_Library_add_linked_libs,svxcore,\ +$(eval $(call gb_Library_use_libraries,svxcore,\ avmedia \ basegfx \ sb \ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index c235c15dfe54..70ba60699ac9 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,textconversiondlgs,\ +$(eval $(call gb_Library_use_api,textconversiondlgs,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ +$(eval $(call gb_Library_use_libraries,textconversiondlgs,\ comphelper \ cppuhelper \ cppu \ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index b9730cf30b5b..614cf194f887 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \ $(call gb_CxxObject_get_target,sw/qa/core/filters-test): $(WORKDIR)/AllLangRes/sw -$(eval $(call gb_CppunitTest_add_linked_libs,sw_filters_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \ sw \ sfx \ svl \ @@ -66,18 +66,18 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sw_filters_test,\ +$(eval $(call gb_CppunitTest_use_api,sw_filters_test,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sw_filters_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sw_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sw_filters_test,\ +$(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index cbf8c6aa1c63..3891c383f689 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \ sw/qa/core/layout-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sw_layout_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \ avmedia \ basegfx \ comphelper \ @@ -75,7 +75,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sw_layout_test,\ +$(eval $(call gb_CppunitTest_use_api,sw_layout_test,\ offapi \ oovbaapi \ udkapi \ @@ -83,12 +83,12 @@ $(eval $(call gb_CppunitTest_add_api,sw_layout_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_layout_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sw_layout_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sw_layout_test,\ oovbaapi \ types \ )) -$(eval $(call gb_CppunitTest_add_components,sw_layout_test,\ +$(eval $(call gb_CppunitTest_use_components,sw_layout_test,\ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 1d287fbbc4ec..fb4d8ec65815 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \ sw/qa/core/macros-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sw_macros_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \ avmedia \ basegfx \ comphelper \ @@ -76,7 +76,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_macros_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sw_macros_test,\ +$(eval $(call gb_CppunitTest_use_api,sw_macros_test,\ offapi \ oovbaapi \ udkapi \ @@ -84,12 +84,12 @@ $(eval $(call gb_CppunitTest_add_api,sw_macros_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_macros_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sw_macros_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sw_macros_test,\ oovbaapi \ types \ )) -$(eval $(call gb_CppunitTest_add_components,sw_macros_test,\ +$(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 27b9c07c90a5..f98aa6162310 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_regression_test, \ sw/qa/extras/regression-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sw_regression_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ avmedia \ basegfx \ comphelper \ @@ -76,7 +76,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_regression_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sw_regression_test,\ +$(eval $(call gb_CppunitTest_use_api,sw_regression_test,\ offapi \ oovbaapi \ udkapi \ @@ -84,12 +84,12 @@ $(eval $(call gb_CppunitTest_add_api,sw_regression_test,\ $(eval $(call gb_CppunitTest_uses_ure,sw_regression_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sw_regression_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sw_regression_test,\ oovbaapi \ types \ )) -$(eval $(call gb_CppunitTest_add_components,sw_regression_test,\ +$(eval $(call gb_CppunitTest_use_components,sw_regression_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk index dfc7f4456d11..0b73c55a2fe9 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmltok, \ sw/qa/extras/ooxmltok/ooxmltok \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_ooxmltok, \ +$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \ cppu \ sal \ test \ @@ -43,18 +43,18 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_ooxmltok, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_api,sw_subsequent_ooxmltok,\ +$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_ooxmltok)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sw_subsequent_ooxmltok,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sw_subsequent_ooxmltok,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sw_subsequent_ooxmltok,\ +$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\ comphelper/util/comphelp \ configmgr/source/configmgr \ fileaccess/source/fileacc \ diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk index fd2aa19f4b46..0e04dc012204 100644 --- a/sw/CppunitTest_sw_subsequent_rtftok.mk +++ b/sw/CppunitTest_sw_subsequent_rtftok.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \ sw/qa/extras/rtftok/rtftok \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_rtftok, \ +$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \ cppu \ sal \ test \ @@ -43,18 +43,18 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_rtftok, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_api,sw_subsequent_rtftok,\ +$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_rtftok)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sw_subsequent_rtftok,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sw_subsequent_rtftok,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sw_subsequent_rtftok,\ +$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\ configmgr/source/configmgr \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 34d32f9c2889..086c4eec2743 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_swdoc_test, \ sw/qa/core/Test-BigPtrArray \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sw_swdoc_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ avmedia \ basegfx \ comphelper \ @@ -80,18 +80,18 @@ $(eval $(call gb_CppunitTest_set_include,sw_swdoc_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sw_swdoc_test,\ +$(eval $(call gb_CppunitTest_use_api,sw_swdoc_test,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sw_swdoc_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\ +$(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\ comphelper/util/comphelp \ configmgr/source/configmgr \ fileaccess/source/fileacc \ diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk index 381417bf2b38..fbfb740c02b9 100644 --- a/sw/JunitTest_sw_complex.mk +++ b/sw/JunitTest_sw_complex.mk @@ -48,7 +48,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\ sw/qa/complex/writer/TextPortionEnumerationTest \ )) -$(eval $(call gb_JunitTest_add_jars,sw_complex,\ +$(eval $(call gb_JunitTest_use_jars,sw_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk index 157dd703ab7d..d11a9638efb2 100644 --- a/sw/JunitTest_sw_unoapi.mk +++ b/sw/JunitTest_sw_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,sw_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,sw_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,sw_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 002621839617..8507bc1d7ddb 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,msword)) $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword)) -$(eval $(call gb_Library_add_external_headers,msword,writerfilter_sprmids)) +$(eval $(call gb_Library_use_package,msword,writerfilter_sprmids)) $(eval $(call gb_Library_set_include,msword,\ -I$(SRCDIR)/sw/source/core/inc \ @@ -40,12 +40,12 @@ $(eval $(call gb_Library_set_include,msword,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,msword,\ +$(eval $(call gb_Library_use_api,msword,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,msword,\ +$(eval $(call gb_Library_use_libraries,msword,\ basegfx \ comphelper \ cppu \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 4d5cdd64d91a..45975a0f800a 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,sw,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,sw,\ +$(eval $(call gb_Library_use_api,sw,\ udkapi \ offapi \ )) @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_defs,sw,\ -DSW_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,sw,\ +$(eval $(call gb_Library_use_libraries,sw,\ avmedia \ basegfx \ comphelper \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index a9e8832d10f2..e084ea7f02cf 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,swd,\ -I$(SRCDIR)/sw/source/ui/inc \ )) -$(eval $(call gb_Library_add_api,swd,\ +$(eval $(call gb_Library_use_api,swd,\ udkapi \ offapi \ )) @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,swd,\ -DSWD_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,swd,\ +$(eval $(call gb_Library_use_libraries,swd,\ comphelper \ cppu \ cppuhelper \ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 7f2cee9e9e82..3dd01176f8c0 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,swui,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,swui,\ +$(eval $(call gb_Library_use_api,swui,\ udkapi \ offapi \ )) @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_cxxflags,swui,\ )) endif -$(eval $(call gb_Library_add_linked_libs,swui,\ +$(eval $(call gb_Library_use_libraries,swui,\ comphelper \ cppu \ cppuhelper \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index 546e6a7462cd..e77dc7823d43 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -38,13 +38,13 @@ $(eval $(call gb_Library_set_include,vbaswobj,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,vbaswobj,\ +$(eval $(call gb_Library_use_api,vbaswobj,\ udkapi \ offapi \ oovbaapi \ )) -$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ +$(eval $(call gb_Library_use_libraries,vbaswobj,\ comphelper \ cppu \ cppuhelper \ diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index 5661927c962f..0fc4feec6e0d 100644 --- a/swext/Jar_mediawiki.mk +++ b/swext/Jar_mediawiki.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/su ifeq ($(SYSTEM_APACHE_COMMONS),YES) # FIXME: use gb_Jar_use_externals? # for the build -$(eval $(call gb_Jar_add_jars,mediawiki,\ +$(eval $(call gb_Jar_use_jars,mediawiki,\ $(COMMONS_CODEC_JAR) \ $(COMMONS_LANG_JAR) \ $(COMMONS_HTTPCLIENT_JAR) \ @@ -58,7 +58,7 @@ $(eval $(call gb_Jar_set_jarclasspath,mediawiki,\ )) endif -$(eval $(call gb_Jar_add_jars,mediawiki,\ +$(eval $(call gb_Jar_use_jars,mediawiki,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ @@ -66,7 +66,7 @@ $(eval $(call gb_Jar_add_jars,mediawiki,\ )) ifneq ($(SYSTEM_APACHE_COMMONS),YES) -$(eval $(call gb_Jar_add_jars,mediawiki,\ +$(eval $(call gb_Jar_use_jars,mediawiki,\ $(OUTDIR)/bin/commons-codec-1.3.jar \ $(OUTDIR)/bin/commons-lang-2.3.jar \ $(OUTDIR)/bin/commons-httpclient-3.1.jar \ diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index bb0214dcb96a..070c6d15f53d 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -31,12 +31,12 @@ $(eval $(call gb_Library_add_defs,subsequenttest,\ -DOOO_DLLIMPLEMENTATION_TEST \ )) -$(eval $(call gb_Library_add_api,subsequenttest,\ +$(eval $(call gb_Library_use_api,subsequenttest,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,subsequenttest,\ +$(eval $(call gb_Library_use_libraries,subsequenttest,\ comphelper \ cppu \ cppuhelper \ diff --git a/test/Library_test.mk b/test/Library_test.mk index d59042522001..f35d2b77b286 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Library_add_defs,test,\ -DOOO_DLLIMPLEMENTATION_TEST \ )) -$(eval $(call gb_Library_add_api,test,\ +$(eval $(call gb_Library_use_api,test,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,test,\ +$(eval $(call gb_Library_use_libraries,test,\ comphelper \ cppu \ cppuhelper \ diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk index 94d2e0d5cb10..12eb369d3668 100644 --- a/toolkit/JunitTest_toolkit_unoapi.mk +++ b/toolkit/JunitTest_toolkit_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/toolkit/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,toolkit_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 60432985d0c2..0518e7a6dacc 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,tk,\ +$(eval $(call gb_Library_use_api,tk,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,tk,\ +$(eval $(call gb_Library_use_libraries,tk,\ comphelper \ cppu \ cppuhelper \ @@ -142,7 +142,7 @@ endif ifneq ($(GUIBASE),headless) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_add_linked_libs,tk,\ +$(eval $(call gb_Library_use_libraries,tk,\ X11 \ )) endif 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 \ diff --git a/ucb/JunitTest_ucb_complex.mk b/ucb/JunitTest_ucb_complex.mk index 625f10a5af5a..7750f6cc6a10 100644 --- a/ucb/JunitTest_ucb_complex.mk +++ b/ucb/JunitTest_ucb_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,ucb_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/ucb/qa/complex/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,ucb_complex,\ +$(eval $(call gb_JunitTest_use_jars,ucb_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/ucb/JunitTest_ucb_unoapi.mk b/ucb/JunitTest_ucb_unoapi.mk index de862158a874..72e728a37144 100644 --- a/ucb/JunitTest_ucb_unoapi.mk +++ b/ucb/JunitTest_ucb_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,ucb_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/ucb/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,ucb_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,ucb_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk index 70f8af18f794..2ef218a4f4b9 100644 --- a/ucb/Library_cached1.mk +++ b/ucb/Library_cached1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,cached1)) $(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1)) -$(eval $(call gb_Library_add_api,cached1,\ +$(eval $(call gb_Library_use_api,cached1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,cached1,\ +$(eval $(call gb_Library_use_libraries,cached1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 8d6b2f775349..09f3302088c5 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,srtrs1)) $(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1)) -$(eval $(call gb_Library_add_api,srtrs1,\ +$(eval $(call gb_Library_use_api,srtrs1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,srtrs1,\ +$(eval $(call gb_Library_use_libraries,srtrs1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 00b87b7c1b42..32ca8baee823 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,ucb1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,ucb1,\ +$(eval $(call gb_Library_use_api,ucb1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucb1,\ +$(eval $(call gb_Library_use_libraries,ucb1,\ comphelper \ cppu \ cppuhelper \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 20ad4aaa3e4e..2a66b406cf8f 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpcmis1)) $(eval $(call gb_Library_set_componentfile,ucpcmis1,ucb/source/ucp/cmis/ucpcmis1)) -$(eval $(call gb_Library_add_api,ucpcmis1,\ +$(eval $(call gb_Library_use_api,ucpcmis1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpcmis1,\ +$(eval $(call gb_Library_use_libraries,ucpcmis1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 61348717ab19..3d7d8d306bd9 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpdav1)) $(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1)) -$(eval $(call gb_Library_add_api,ucpdav1,\ +$(eval $(call gb_Library_use_api,ucpdav1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpdav1,\ +$(eval $(call gb_Library_use_libraries,ucpdav1,\ comphelper \ cppu \ cppuhelper \ @@ -75,13 +75,13 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,ucpdav1,\ +$(eval $(call gb_Library_use_libraries,ucpdav1,\ ws2_32 \ )) endif ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_add_linked_libs,ucpdav1,\ +$(eval $(call gb_Library_use_libraries,ucpdav1,\ dl \ nsl \ socket \ diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk index 0209bfcd5222..962cf2d90324 100644 --- a/ucb/Library_ucpexpand1.mk +++ b/ucb/Library_ucpexpand1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpexpand1)) $(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1)) -$(eval $(call gb_Library_add_api,ucpexpand1,\ +$(eval $(call gb_Library_use_api,ucpexpand1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpexpand1,\ +$(eval $(call gb_Library_use_libraries,ucpexpand1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 5a6017153c0c..9d648fbd8cc8 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpext)) $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext)) -$(eval $(call gb_Library_add_api,ucpext,\ +$(eval $(call gb_Library_use_api,ucpext,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpext,\ +$(eval $(call gb_Library_use_libraries,ucpext,\ comphelper \ cppu \ cppuhelper \ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 6d513ceb945e..db3e2739f72a 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpfile1)) $(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1)) -$(eval $(call gb_Library_add_api,ucpfile1,\ +$(eval $(call gb_Library_use_api,ucpfile1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpfile1,\ +$(eval $(call gb_Library_use_libraries,ucpfile1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk index e4d5d561fd58..f0c6fc2b5d25 100644 --- a/ucb/Library_ucpftp1.mk +++ b/ucb/Library_ucpftp1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpftp1)) $(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1)) -$(eval $(call gb_Library_add_api,ucpftp1,\ +$(eval $(call gb_Library_use_api,ucpftp1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpftp1,\ +$(eval $(call gb_Library_use_libraries,ucpftp1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk index ec3dc9bcd6e3..c01b1255b93a 100644 --- a/ucb/Library_ucpgio1.mk +++ b/ucb/Library_ucpgio1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpgio1)) $(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio)) -$(eval $(call gb_Library_add_api,ucpgio1,\ +$(eval $(call gb_Library_use_api,ucpgio1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpgio1,\ +$(eval $(call gb_Library_use_libraries,ucpgio1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk index 787d9a6d014a..321359c20d04 100644 --- a/ucb/Library_ucpgvfs1.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,ucpgvfs1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,ucpgvfs1,\ +$(eval $(call gb_Library_use_api,ucpgvfs1,\ offapi \ udkapi \ )) @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_libs,ucpgvfs1,\ $(GNOMEVFS_LIBS) \ )) -$(eval $(call gb_Library_add_linked_libs,ucpgvfs1,\ +$(eval $(call gb_Library_use_libraries,ucpgvfs1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 059e408bf320..d3c7030be320 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucphier1)) $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1)) -$(eval $(call gb_Library_add_api,ucphier1,\ +$(eval $(call gb_Library_use_api,ucphier1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucphier1,\ +$(eval $(call gb_Library_use_libraries,ucphier1,\ cppu \ cppuhelper \ sal \ diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk index ef60121af04d..8536de71324b 100644 --- a/ucb/Library_ucpodma1.mk +++ b/ucb/Library_ucpodma1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpodma1)) $(eval $(call gb_Library_set_componentfile,ucpodma1,ucb/source/ucp/odma/ucpodma1)) -$(eval $(call gb_Library_add_api,ucpodma1,\ +$(eval $(call gb_Library_use_api,ucpodma1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucpodma1,\ +$(eval $(call gb_Library_use_libraries,ucpodma1,\ cppu \ cppuhelper \ sal \ @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,ucpodma1,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,ucpodma1,\ +$(eval $(call gb_Library_use_static_libraries,ucpodma1,\ odma_lib \ )) diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index b3a5764bd2cb..5f0aa247173a 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucppkg1)) $(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1)) -$(eval $(call gb_Library_add_api,ucppkg1,\ +$(eval $(call gb_Library_use_api,ucppkg1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucppkg1,\ +$(eval $(call gb_Library_use_libraries,ucppkg1,\ comphelper \ cppu \ cppuhelper \ diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk index a84212c4cc55..d79f42e9b056 100644 --- a/ucb/Library_ucptdoc1.mk +++ b/ucb/Library_ucptdoc1.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucptdoc1)) $(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1)) -$(eval $(call gb_Library_add_api,ucptdoc1,\ +$(eval $(call gb_Library_use_api,ucptdoc1,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucptdoc1,\ +$(eval $(call gb_Library_use_libraries,ucptdoc1,\ comphelper \ cppu \ cppuhelper \ diff --git a/ucb/StaticLibrary_odma_lib.mk b/ucb/StaticLibrary_odma_lib.mk index 5c46d9bda455..d9e1fe4a0d73 100644 --- a/ucb/StaticLibrary_odma_lib.mk +++ b/ucb/StaticLibrary_odma_lib.mk @@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,odma_lib)) $(eval $(call gb_StaticLibrary_add_package_headers,odma_lib,ucb_odma_inc)) -$(eval $(call gb_StaticLibrary_add_api,odma_lib,\ +$(eval $(call gb_StaticLibrary_use_api,odma_lib,\ offapi \ udkapi \ )) diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index ee7ccddc13ae..3d93a1586e94 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -39,12 +39,12 @@ $(eval $(call gb_Library_add_defs,ucbhelper,\ -DUCBHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,ucbhelper,\ +$(eval $(call gb_Library_use_api,ucbhelper,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ucbhelper,\ +$(eval $(call gb_Library_use_libraries,ucbhelper,\ cppu \ cppuhelper \ sal \ diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk index ff8f286f6d98..10444531608f 100644 --- a/unoil/Jar_unoil.mk +++ b/unoil/Jar_unoil.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,unoil)) -$(eval $(call gb_Jar_add_customtarget_dependencies,unoil,\ +$(eval $(call gb_Jar_use_customtargets,unoil,\ unoil/javamaker \ )) diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk index 1088d5d4905b..f68b5a2931e4 100644 --- a/unotest/Jar_test-tools.mk +++ b/unotest/Jar_test-tools.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Jar_set_jarclasspath,test-tools,\ unoil.jar \ )) -$(eval $(call gb_Jar_add_jars,test-tools,\ +$(eval $(call gb_Jar_use_jars,test-tools,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk index eca653f26629..6c4e4aa78692 100644 --- a/unotest/Jar_test.mk +++ b/unotest/Jar_test.mk @@ -33,14 +33,14 @@ $(eval $(call gb_Jar_set_jarclasspath,test,\ unoil.jar \ )) -$(eval $(call gb_Jar_add_jars,test,\ +$(eval $(call gb_Jar_use_jars,test,\ $(OUTDIR)/bin/juh.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/OOoRunner.jar \ )) -$(eval $(call gb_Jar_add_system_jars,test,\ +$(eval $(call gb_Jar_use_system_jars,test,\ $(OOO_JUNIT_JAR) \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index 3324f3e416ce..c23b1959ac3b 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,unoexceptionprotector)) $(eval $(call gb_Library_add_package_headers,unoexceptionprotector,unotest_inc)) -$(eval $(call gb_Library_add_api,unoexceptionprotector,\ +$(eval $(call gb_Library_use_api,unoexceptionprotector,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,unoexceptionprotector,\ +$(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ cppu \ cppuhelper \ sal \ diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index aad6abdbceec..96ad171aad80 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Library_add_defs,unotest,\ -DOOO_DLLIMPLEMENTATION_UNOTEST \ )) -$(eval $(call gb_Library_add_api,unotest,\ +$(eval $(call gb_Library_use_api,unotest,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,unotest,\ +$(eval $(call gb_Library_use_libraries,unotest,\ comphelper \ cppu \ cppuhelper \ diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk index 43a41d711e50..065ebcc5da14 100644 --- a/unotools/JunitTest_unotools_complex.mk +++ b/unotools/JunitTest_unotools_complex.mk @@ -32,7 +32,7 @@ $(eval $(call gb_JunitTest_set_defs,unotools_complex,\ $$(DEFS) \ )) -$(eval $(call gb_JunitTest_add_jars,unotools_complex,\ +$(eval $(call gb_JunitTest_use_jars,unotools_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 98fad08b46f7..c6892994501f 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -47,14 +47,14 @@ $(eval $(call gb_Library_add_defs,utl,\ -DUNOTOOLS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,utl,\ +$(eval $(call gb_Library_use_api,utl,\ offapi \ udkapi \ )) # add libraries to be linked to utl; again these names need to be given as # specified in Repository.mk -$(eval $(call gb_Library_add_linked_libs,utl,\ +$(eval $(call gb_Library_use_libraries,utl,\ comphelper \ cppu \ cppuhelper \ diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk index bd0c12fa2e41..7d2f47b22b4d 100644 --- a/unoxml/JunitTest_unordf_complex.mk +++ b/unoxml/JunitTest_unordf_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,unordf_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,unordf_complex,\ +$(eval $(call gb_JunitTest_use_jars,unordf_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk index 5a5cd4ffa8e0..3f1f679ecda4 100644 --- a/unoxml/JunitTest_unoxml_complex.mk +++ b/unoxml/JunitTest_unoxml_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,unoxml_complex,\ +$(eval $(call gb_JunitTest_use_jars,unoxml_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk index cb21c0674fe6..a14ec7846007 100644 --- a/unoxml/Library_unordf.mk +++ b/unoxml/Library_unordf.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,unordf,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,unordf,\ +$(eval $(call gb_Library_use_api,unordf,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,unordf,\ +$(eval $(call gb_Library_use_libraries,unordf,\ comphelper \ cppuhelper \ cppu \ diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 8014bace26cb..b744d00eaab5 100644 --- a/unoxml/Library_unoxml.mk +++ b/unoxml/Library_unoxml.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,unoxml,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,unoxml,\ +$(eval $(call gb_Library_use_api,unoxml,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,unoxml,\ +$(eval $(call gb_Library_use_libraries,unoxml,\ ucbhelper \ sax \ comphelper \ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 95fde292b921..d3f2280569bf 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,uui)) $(eval $(call gb_Library_set_componentfile,uui,uui/util/uui)) -$(eval $(call gb_Library_add_api,uui,\ +$(eval $(call gb_Library_use_api,uui,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,uui,\ +$(eval $(call gb_Library_use_libraries,uui,\ comphelper \ cppu \ cppuhelper \ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 235042500da2..1b0e56526cf7 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,msforms,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,msforms,\ +$(eval $(call gb_Library_use_api,msforms,\ udkapi \ offapi \ oovbaapi \ @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_api,msforms,\ # add libraries to be linked to LIB; again these names need to be given as # specified in Repository.mk -$(eval $(call gb_Library_add_linked_libs,msforms,\ +$(eval $(call gb_Library_use_libraries,msforms,\ comphelper \ cppu \ cppuhelper \ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index eee707dbbe0e..5c7f39ae75af 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,vbahelper,\ -DVBAHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,vbahelper,\ +$(eval $(call gb_Library_use_api,vbahelper,\ udkapi \ offapi \ oovbaapi \ @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_api,vbahelper,\ # add libraries to be linked to vbahelper; again these names need to be given as # specified in Repository.mk -$(eval $(call gb_Library_add_linked_libs,vbahelper,\ +$(eval $(call gb_Library_use_libraries,vbahelper,\ comphelper \ cppu \ cppuhelper \ diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk index 2bfa978d6b3e..9e185e155544 100644 --- a/vcl/Executable_kdefilepicker.mk +++ b/vcl/Executable_kdefilepicker.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Executable_add_defs,kdefilepicker,\ $(KDE_CFLAGS) \ )) -$(eval $(call gb_Executable_add_linked_libs,kdefilepicker,\ +$(eval $(call gb_Executable_use_libraries,kdefilepicker,\ sal \ $(gb_STDLIBS) \ )) diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 8b1054dc4b5b..c6ab1adeadcf 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_defs,desktop_detector,\ -DDESKTOP_DETECTOR_IMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,desktop_detector,\ +$(eval $(call gb_Library_use_api,desktop_detector,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,desktop_detector,\ +$(eval $(call gb_Library_use_libraries,desktop_detector,\ vcl \ tl \ utl \ @@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,desktop_detector,\ +$(eval $(call gb_Library_use_libraries,desktop_detector,\ dl \ m \ pthread \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 730fdd5b3568..d37a5bb7e80a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -44,7 +44,7 @@ endif $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) -$(eval $(call gb_Library_add_custom_headers,vcl,vcl/generic/fontmanager)) +$(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager)) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ @@ -58,12 +58,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ )) -$(eval $(call gb_Library_add_api,vcl,\ +$(eval $(call gb_Library_use_api,vcl,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ tl \ utl \ sot \ @@ -79,7 +79,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ )) ifneq ($(OS),IOS) -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ jvmaccess \ )) endif @@ -288,7 +288,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) else -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ version \ )) endif @@ -383,7 +383,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/aqua/source/window/salmenu \ vcl/aqua/source/window/salobj \ )) -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) $(eval $(call gb_Library_use_externals,vcl,\ @@ -464,7 +464,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ $(vcl_headless_code) \ )) -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ basebmp \ )) @@ -495,7 +495,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ $(vcl_headless_code) \ )) -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ basebmp \ )) @@ -563,7 +563,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/window/salobj \ )) -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ advapi32 \ gdi32 \ gdiplus \ @@ -588,7 +588,7 @@ endif endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vcl,\ +$(eval $(call gb_Library_use_libraries,vcl,\ dl \ m \ pthread \ @@ -608,7 +608,7 @@ endif endif ifneq ($(OS),IOS) -$(eval $(call gb_Library_add_linked_static_libs,vcl,\ +$(eval $(call gb_Library_use_static_libraries,vcl,\ vclmain \ )) endif diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 8407c265a51c..2f42059e8d43 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\ -I$(SRCDIR)/solenv/inc \ )) -$(eval $(call gb_Library_add_api,vclplug_gen,\ +$(eval $(call gb_Library_use_api,vclplug_gen,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ +$(eval $(call gb_Library_use_libraries,vclplug_gen,\ vcl \ tl \ utl \ @@ -173,7 +173,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ +$(eval $(call gb_Library_use_libraries,vclplug_gen,\ dl \ m \ pthread \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 201daa346c86..658c72dd35d9 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -41,12 +41,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) -$(eval $(call gb_Library_add_api,vclplug_gtk,\ +$(eval $(call gb_Library_use_api,vclplug_gtk,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ +$(eval $(call gb_Library_use_libraries,vclplug_gtk,\ vclplug_gen \ vcl \ tl \ @@ -114,7 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ +$(eval $(call gb_Library_use_libraries,vclplug_gtk,\ dl \ m \ pthread \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 0cc3c2335378..29bcf0bd9708 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) -$(eval $(call gb_Library_add_api,vclplug_gtk3,\ +$(eval $(call gb_Library_use_api,vclplug_gtk3,\ offapi \ udkapi \ )) @@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gtk3,\ $$(GTHREAD_LIBS) \ )) -$(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\ +$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ vcl \ tl \ utl \ @@ -113,12 +113,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\ vcl/unx/gtk3/window/gtk3gtkobject \ )) -$(eval $(call gb_Library_add_linked_static_libs,vclplug_gtk3,\ +$(eval $(call gb_Library_use_static_libraries,vclplug_gtk3,\ headless \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\ +$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ dl \ m \ pthread \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 5cc8df63c125..fb0a0bd8192f 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde,\ -DVCLPLUG_KDE_IMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,vclplug_kde,\ +$(eval $(call gb_Library_use_api,vclplug_kde,\ offapi \ udkapi \ )) @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_libs,vclplug_kde,\ $$(KDE_LIBS) \ )) -$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ +$(eval $(call gb_Library_use_libraries,vclplug_kde,\ vclplug_gen \ vcl \ tl \ @@ -95,7 +95,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_kde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ +$(eval $(call gb_Library_use_libraries,vclplug_kde,\ dl \ m \ pthread \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 6c5fb1b46da4..a529bf32de31 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,vclplug_kde4)) -$(eval $(call gb_Library_add_custom_headers,vclplug_kde4,vcl/unx/kde4)) +$(eval $(call gb_Library_use_custom_headers,vclplug_kde4,vcl/unx/kde4)) $(eval $(call gb_Library_set_include,vclplug_kde4,\ $$(INCLUDE) \ @@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde4,\ -DVCLPLUG_KDE4_IMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,vclplug_kde4,\ +$(eval $(call gb_Library_use_api,vclplug_kde4,\ offapi \ udkapi \ )) @@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_libs,vclplug_kde4,\ -lkio -lkfile \ )) -$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ +$(eval $(call gb_Library_use_libraries,vclplug_kde4,\ vclplug_gen \ vcl \ tl \ @@ -99,7 +99,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_kde4,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ +$(eval $(call gb_Library_use_libraries,vclplug_kde4,\ dl \ m \ pthread \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index e0c5a00a0123..9d93a6ed5afb 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,vclplug_svp,\ -DVCLPLUG_SVP_IMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,vclplug_svp,\ +$(eval $(call gb_Library_use_api,vclplug_svp,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ +$(eval $(call gb_Library_use_libraries,vclplug_svp,\ vcl \ tl \ utl \ @@ -76,12 +76,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ vcl/headless/svpdata \ )) -$(eval $(call gb_Library_add_linked_static_libs,vclplug_svp,\ +$(eval $(call gb_Library_use_static_libraries,vclplug_svp,\ headless \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ +$(eval $(call gb_Library_use_libraries,vclplug_svp,\ dl \ m \ pthread \ diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index bea6fede0b68..ffa71c19db31 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -28,7 +28,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) -$(eval $(call gb_StaticLibrary_add_api,headless,\ +$(eval $(call gb_StaticLibrary_use_api,headless,\ offapi \ udkapi \ )) diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index eabd8ea78e45..b816de636f62 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -40,7 +40,7 @@ $(eval $(call gb_StaticLibrary_set_include,vclmain,\ -I$(SRCDIR)/solenv/inc \ )) -$(eval $(call gb_StaticLibrary_add_api,vclmain,\ +$(eval $(call gb_StaticLibrary_use_api,vclmain,\ offapi \ udkapi \ )) diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk index fe3e33898c4f..3d61f3b923e7 100644 --- a/wizards/Jar_agenda.mk +++ b/wizards/Jar_agenda.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,agenda)) -$(eval $(call gb_Jar_add_jars,agenda,\ +$(eval $(call gb_Jar_use_jars,agenda,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk index b5a4170aa336..19c8bdcc0466 100644 --- a/wizards/Jar_commonwizards.mk +++ b/wizards/Jar_commonwizards.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,commonwizards)) -$(eval $(call gb_Jar_add_jars,commonwizards,\ +$(eval $(call gb_Jar_use_jars,commonwizards,\ $(OUTDIR_FOR_BUILD)/bin/ridl.jar \ $(OUTDIR_FOR_BUILD)/bin/unoil.jar \ $(OUTDIR_FOR_BUILD)/bin/jurt.jar \ diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk index a30849bc7f9f..a25a20a3c1a6 100644 --- a/wizards/Jar_fax.mk +++ b/wizards/Jar_fax.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,fax)) -$(eval $(call gb_Jar_add_jars,fax,\ +$(eval $(call gb_Jar_use_jars,fax,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk index 735687b37981..54e490869402 100644 --- a/wizards/Jar_form.mk +++ b/wizards/Jar_form.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,form)) -$(eval $(call gb_Jar_add_jars,form,\ +$(eval $(call gb_Jar_use_jars,form,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk index 7be19749e049..4d6133e84b88 100644 --- a/wizards/Jar_letter.mk +++ b/wizards/Jar_letter.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,letter)) -$(eval $(call gb_Jar_add_jars,letter,\ +$(eval $(call gb_Jar_use_jars,letter,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk index c4238dfeac84..000ce7d22693 100644 --- a/wizards/Jar_query.mk +++ b/wizards/Jar_query.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,query)) -$(eval $(call gb_Jar_add_jars,query,\ +$(eval $(call gb_Jar_use_jars,query,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk index da8e28d617f5..b9660dd7e107 100644 --- a/wizards/Jar_report.mk +++ b/wizards/Jar_report.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,report)) -$(eval $(call gb_Jar_add_jars,report,\ +$(eval $(call gb_Jar_use_jars,report,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk index 1304854eb8fe..d6f9dae7f244 100644 --- a/wizards/Jar_reportbuilder.mk +++ b/wizards/Jar_reportbuilder.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,reportbuilderwizard)) -$(eval $(call gb_Jar_add_jars,reportbuilderwizard,\ +$(eval $(call gb_Jar_use_jars,reportbuilderwizard,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk index 4ed34c40d3ed..7bc9102d9a90 100644 --- a/wizards/Jar_table.mk +++ b/wizards/Jar_table.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,table)) -$(eval $(call gb_Jar_add_jars,table,\ +$(eval $(call gb_Jar_use_jars,table,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk index 36a2434c9d2c..a31a2f647a44 100644 --- a/wizards/Jar_web.mk +++ b/wizards/Jar_web.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Jar_Jar,web)) -$(eval $(call gb_Jar_add_jars,web,\ +$(eval $(call gb_Jar_use_jars,web,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index f694d45b26ce..af137ec4f01c 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \ writerfilter/qa/cppunittests/doctok/testdoctok \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \ +$(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ cppu \ cppuhelper \ doctok \ @@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ -I$(SRCDIR)/writerfilter/inc \ )) -$(eval $(call gb_CppunitTest_add_api,writerfilter_doctok,\ +$(eval $(call gb_CppunitTest_use_api,writerfilter_doctok,\ offapi \ udkapi \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 564a73adae18..64ef3d02e8b3 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \ writerfilter/qa/cppunittests/rtftok/testrtftok \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_rtftok, \ +$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ comphelper \ cppu \ cppuhelper \ @@ -47,18 +47,18 @@ $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_rtftok, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_api,writerfilter_rtftok,\ +$(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,writerfilter_rtftok)) -$(eval $(call gb_CppunitTest_add_type_rdbs,writerfilter_rtftok,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,writerfilter_rtftok,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,writerfilter_rtftok,\ +$(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ configmgr/source/configmgr \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk index d9d1a5cf727b..360f86c01e0f 100644 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ b/writerfilter/JunitTest_writerfilter_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,writerfilter_complex,\ +$(eval $(call gb_JunitTest_use_jars,writerfilter_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk index 8c7eaea0ce9b..501bc29f816e 100644 --- a/writerfilter/Library_doctok.mk +++ b/writerfilter/Library_doctok.mk @@ -44,12 +44,12 @@ $(eval $(call gb_Library_add_defs,doctok,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_api,doctok,\ +$(eval $(call gb_Library_use_api,doctok,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,doctok,\ +$(eval $(call gb_Library_use_libraries,doctok,\ cppu \ cppuhelper \ resourcemodel \ diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk index 787f6b730b89..aae025f719d0 100644 --- a/writerfilter/Library_ooxml.mk +++ b/writerfilter/Library_ooxml.mk @@ -45,12 +45,12 @@ $(eval $(call gb_Library_add_defs,ooxml,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_api,ooxml,\ +$(eval $(call gb_Library_use_api,ooxml,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,ooxml,\ +$(eval $(call gb_Library_use_libraries,ooxml,\ comphelper \ cppu \ cppuhelper \ diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk index 4583db410704..aa3d2844b264 100644 --- a/writerfilter/Library_resourcemodel.mk +++ b/writerfilter/Library_resourcemodel.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,resourcemodel)) -$(eval $(call gb_Library_add_custom_headers,resourcemodel,writerfilter/source)) +$(eval $(call gb_Library_use_custom_headers,resourcemodel,writerfilter/source)) $(eval $(call gb_Library_set_include,resourcemodel,\ $$(INCLUDE) \ @@ -41,12 +41,12 @@ $(eval $(call gb_Library_add_defs,resourcemodel,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_api,resourcemodel,\ +$(eval $(call gb_Library_use_api,resourcemodel,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,resourcemodel,\ +$(eval $(call gb_Library_use_libraries,resourcemodel,\ comphelper \ cppu \ cppuhelper \ diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk index 392de9380a40..5521362eeca7 100644 --- a/writerfilter/Library_rtftok.mk +++ b/writerfilter/Library_rtftok.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,rtftok,\ -I$(WORKDIR)/CustomTarget/writerfilter/source \ )) -$(eval $(call gb_Library_add_api,rtftok,\ +$(eval $(call gb_Library_use_api,rtftok,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,rtftok,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_linked_libs,rtftok,\ +$(eval $(call gb_Library_use_libraries,rtftok,\ cppu \ cppuhelper \ oox \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index b77be991945a..ce15f01938d1 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_include,writerfilter,\ -I$(SRCDIR)/writerfilter/inc \ )) -$(eval $(call gb_Library_add_api,writerfilter,\ +$(eval $(call gb_Library_use_api,writerfilter,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,writerfilter,\ $(writerfilter_debug_flags) \ )) -$(eval $(call gb_Library_add_linked_libs,writerfilter,\ +$(eval $(call gb_Library_use_libraries,writerfilter,\ resourcemodel \ comphelper \ cppu \ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index 2ea4f9782032..714d6a7b52cd 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Library_add_defs,writerfilter_uno,\ -DWRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,writerfilter_uno,\ +$(eval $(call gb_Library_use_api,writerfilter_uno,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\ +$(eval $(call gb_Library_use_libraries,writerfilter_uno,\ comphelper \ cppu \ cppuhelper \ diff --git a/writerperfect/Library_cdrimport.mk b/writerperfect/Library_cdrimport.mk index 8688f8a86b11..a6b05b03d557 100644 --- a/writerperfect/Library_cdrimport.mk +++ b/writerperfect/Library_cdrimport.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,cdrimport,\ -I$(SRCDIR)/writerperfect/source \ )) -$(eval $(call gb_Library_add_api,cdrimport,\ +$(eval $(call gb_Library_use_api,cdrimport,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,cdrimport,\ +$(eval $(call gb_Library_use_libraries,cdrimport,\ cppu \ cppuhelper \ sal \ @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,cdrimport,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,cdrimport,\ +$(eval $(call gb_Library_use_static_libraries,cdrimport,\ writerperfect \ )) diff --git a/writerperfect/Library_msworks.mk b/writerperfect/Library_msworks.mk index a958a343006d..7efb9944a24d 100644 --- a/writerperfect/Library_msworks.mk +++ b/writerperfect/Library_msworks.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,msworks,\ -I$(SRCDIR)/writerperfect/source \ )) -$(eval $(call gb_Library_add_api,msworks,\ +$(eval $(call gb_Library_use_api,msworks,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,msworks,\ +$(eval $(call gb_Library_use_libraries,msworks,\ cppu \ cppuhelper \ sal \ @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,msworks,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,msworks,\ +$(eval $(call gb_Library_use_static_libraries,msworks,\ writerperfect \ )) diff --git a/writerperfect/Library_visioimport.mk b/writerperfect/Library_visioimport.mk index b36d95e2360e..7db2b04bbd9e 100644 --- a/writerperfect/Library_visioimport.mk +++ b/writerperfect/Library_visioimport.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,visioimport,\ -I$(SRCDIR)/writerperfect/source \ )) -$(eval $(call gb_Library_add_api,visioimport,\ +$(eval $(call gb_Library_use_api,visioimport,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,visioimport,\ +$(eval $(call gb_Library_use_libraries,visioimport,\ cppu \ cppuhelper \ sal \ @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,visioimport,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,visioimport,\ +$(eval $(call gb_Library_use_static_libraries,visioimport,\ writerperfect \ )) diff --git a/writerperfect/Library_wpft.mk b/writerperfect/Library_wpft.mk index 853536fed268..113cb17fad60 100644 --- a/writerperfect/Library_wpft.mk +++ b/writerperfect/Library_wpft.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,wpft,\ -I$(SRCDIR)/writerperfect/source \ )) -$(eval $(call gb_Library_add_api,wpft,\ +$(eval $(call gb_Library_use_api,wpft,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,wpft,\ +$(eval $(call gb_Library_use_libraries,wpft,\ cppu \ cppuhelper \ vcl \ @@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,wpft,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,wpft,\ +$(eval $(call gb_Library_use_static_libraries,wpft,\ writerperfect \ )) diff --git a/writerperfect/Library_wpgimport.mk b/writerperfect/Library_wpgimport.mk index 43a0064d3ef7..b2cbd66e238a 100644 --- a/writerperfect/Library_wpgimport.mk +++ b/writerperfect/Library_wpgimport.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,wpgimport,\ -I$(SRCDIR)/writerperfect/source \ )) -$(eval $(call gb_Library_add_api,wpgimport,\ +$(eval $(call gb_Library_use_api,wpgimport,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,wpgimport,\ +$(eval $(call gb_Library_use_libraries,wpgimport,\ cppu \ cppuhelper \ sal \ @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,wpgimport,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_static_libs,wpgimport,\ +$(eval $(call gb_Library_use_static_libraries,wpgimport,\ writerperfect \ )) diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 4ff3e51acad3..8a0ed602b0ce 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -38,7 +38,7 @@ $(eval $(call gb_StaticLibrary_use_externals,writerperfect,\ wpg \ )) -$(eval $(call gb_StaticLibrary_add_api,writerperfect,\ +$(eval $(call gb_StaticLibrary_use_api,writerperfect,\ offapi \ udkapi \ )) diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk index b2c7eb7dd843..a346b05bea92 100644 --- a/xmerge/Jar_XMergeBridge.mk +++ b/xmerge/Jar_XMergeBridge.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Jar_set_jarclasspath,XMergeBridge,\ xmerge.jar \ )) -$(eval $(call gb_Jar_add_jars,XMergeBridge,\ +$(eval $(call gb_Jar_use_jars,XMergeBridge,\ $(OUTDIR)/bin/xmerge.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk index 0c639b30a1a3..8c079a99767c 100644 --- a/xmerge/Jar_aportisdoc.mk +++ b/xmerge/Jar_aportisdoc.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR) $(eval $(call gb_Jar_set_packageroot,aportisdoc,org)) -$(eval $(call gb_Jar_add_jars,aportisdoc,\ +$(eval $(call gb_Jar_use_jars,aportisdoc,\ $(OUTDIR)/bin/xmerge.jar \ )) diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk index 9f71977f72b9..da2c47cf89ce 100644 --- a/xmerge/Jar_pexcel.mk +++ b/xmerge/Jar_pexcel.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xme $(eval $(call gb_Jar_set_packageroot,pexcel,org)) -$(eval $(call gb_Jar_add_jars,pexcel,\ +$(eval $(call gb_Jar_use_jars,pexcel,\ $(OUTDIR)/bin/xmerge.jar \ )) diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk index 41734b630110..35ded736d617 100644 --- a/xmerge/Jar_pocketword.mk +++ b/xmerge/Jar_pocketword.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR) $(eval $(call gb_Jar_set_packageroot,pocketword,org)) -$(eval $(call gb_Jar_add_jars,pocketword,\ +$(eval $(call gb_Jar_use_jars,pocketword,\ $(OUTDIR)/bin/xmerge.jar \ )) diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk index 241a9990e94a..27de50bf06a3 100644 --- a/xmerge/Jar_xmerge.mk +++ b/xmerge/Jar_xmerge.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Jar_Jar,xmerge)) $(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf)) -$(eval $(call gb_Jar_add_jars,xmerge,\ +$(eval $(call gb_Jar_use_jars,xmerge,\ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk index 660bc5f8a6dd..878e9e20fe53 100644 --- a/xml2cmp/Executable_xml2cmp.mk +++ b/xml2cmp/Executable_xml2cmp.mk @@ -48,6 +48,6 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\ #uwinapi is part of STDLIBS on windows, but it is created in sal, which #depends on this module. -$(eval $(call gb_Executable_add_linked_libs,xml2cmp,\ +$(eval $(call gb_Executable_use_libraries,xml2cmp,\ $(filter-out uwinapi,$(gb_STDLIBS)) \ )) diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk index 75c87260160e..8ea50cd443f9 100644 --- a/xmlhelp/Library_tvhlp1.mk +++ b/xmlhelp/Library_tvhlp1.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,tvhlp1)) $(eval $(call gb_Library_set_componentfile,tvhlp1,xmlhelp/source/treeview/tvhlp1)) -$(eval $(call gb_Library_add_api,tvhlp1,\ +$(eval $(call gb_Library_use_api,tvhlp1,\ offapi \ udkapi \ )) @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_externals,tvhlp1,\ expat_utf8 \ )) -$(eval $(call gb_Library_add_linked_libs,tvhlp1,\ +$(eval $(call gb_Library_use_libraries,tvhlp1,\ comphelper \ cppu \ cppuhelper \ diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index d9006b8927f5..2dfe46f4edcf 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,ucpchelp1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,ucpchelp1,\ +$(eval $(call gb_Library_use_api,ucpchelp1,\ offapi \ udkapi \ )) @@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_externals,ucpchelp1,\ libxslt \ )) -$(eval $(call gb_Library_add_linked_libs,ucpchelp1,\ +$(eval $(call gb_Library_use_libraries,ucpchelp1,\ comphelper \ cppu \ cppuhelper \ diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk index 11ad77210520..e506f9b47a44 100644 --- a/xmloff/JunitTest_xmloff_unoapi.mk +++ b/xmloff/JunitTest_xmloff_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/xmloff/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,xmloff_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,xmloff_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index fe3d14693ad0..9fbfcdd5e877 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -41,12 +41,12 @@ $(eval $(call gb_Library_add_defs,xo,\ -DXMLOFF_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,xo,\ +$(eval $(call gb_Library_use_api,xo,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,xo,\ +$(eval $(call gb_Library_use_libraries,xo,\ basegfx \ comphelper \ cppu \ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 26cb1a95cf7e..2b7f17af91c9 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,xof,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,xof,\ +$(eval $(call gb_Library_use_api,xof,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,xof,\ +$(eval $(call gb_Library_use_libraries,xof,\ comphelper \ cppu \ cppuhelper \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index 7e5d9b572a50..cd1065a98508 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_defs,xmlreader,\ -DOOO_DLLIMPLEMENTATION_XMLREADER \ )) -$(eval $(call gb_Library_add_linked_libs,xmlreader,\ +$(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ $(gb_STDLIBS) \ @@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/xmlreader \ )) -$(eval $(call gb_Library_add_api,xmlreader,\ +$(eval $(call gb_Library_use_api,xmlreader,\ offapi \ udkapi \ )) diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk index 1e5b211c3b3d..89a45fbd9b66 100644 --- a/xmlscript/Library_xcr.mk +++ b/xmlscript/Library_xcr.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,xcr,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,xcr,\ +$(eval $(call gb_Library_use_api,xcr,\ offapi \ udkapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,xcr,\ -DXCR_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,xcr,\ +$(eval $(call gb_Library_use_libraries,xcr,\ comphelper \ cppu \ cppuhelper \ diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index a4e1a8f354fc..7fd7af10deb3 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -32,12 +32,12 @@ $(eval $(call gb_CppunitTest_set_include,xmlsecurity_qa_certext,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,xmlsecurity_qa_certext,\ +$(eval $(call gb_CppunitTest_use_api,xmlsecurity_qa_certext,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,xmlsecurity_qa_certext,\ +$(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ cppu \ neon \ sal \ diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index dbe578b82e27..ad8c0971910f 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,xmlsecurity,\ -I$(SRCDIR)/xmlsecurity/inc \ )) -$(eval $(call gb_Library_add_api,xmlsecurity,\ +$(eval $(call gb_Library_use_api,xmlsecurity,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,xmlsecurity,\ +$(eval $(call gb_Library_use_libraries,xmlsecurity,\ comphelper \ cppu \ cppuhelper \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 6020866a6fae..74a55d14adbd 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,xsec_fw,\ -I$(SRCDIR)/xmlsecurity/inc \ )) -$(eval $(call gb_Library_add_api,xsec_fw,\ +$(eval $(call gb_Library_use_api,xsec_fw,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,xsec_fw,\ +$(eval $(call gb_Library_use_libraries,xsec_fw,\ cppu \ cppuhelper \ sal \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index cafde20b9812..915acab22a7d 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\ -I$(SRCDIR)/xmlsecurity/source/xmlsec \ )) -$(eval $(call gb_Library_add_api,xsec_xmlsec,\ +$(eval $(call gb_Library_use_api,xsec_xmlsec,\ udkapi \ offapi \ )) @@ -50,17 +50,17 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ xmlsec1 \ )) else -$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\ xmlsec1 \ )) endif -$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ comphelper \ cppu \ cppuhelper \ @@ -98,11 +98,11 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_MSCRYPTO \ )) -$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ xmlsec1-mscrypto \ )) -$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ crypt32 \ advapi32 \ )) @@ -124,7 +124,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_NSS \ )) -$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\ xmlsec1-nss \ )) @@ -168,7 +168,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\ -I$(OUTDIR)/inc/mozilla/nss \ )) -$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ nspr4 \ nss3 \ )) @@ -176,7 +176,7 @@ $(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ endif # ifeq ($(SYSTEM_NSS),YES) ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ +$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ dl \ )) endif |