diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 53 | ||||
| -rw-r--r-- | solenv/gbuild/Executable.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 60 | ||||
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 47 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 67 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 96 | ||||
| -rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/templates/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/Executable.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/JunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/Library.mk | 2 |
13 files changed, 308 insertions, 59 deletions
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) \ )) |