gbuild: remove error stubs for renamed/removed functions

Change-Id: If1d0d5294af87f2b780deadb21d12a6ee90dead6

solenv/gbuild/CppunitTest.mk

@@ -140,10 +140,6 @@ $(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT := TRUE
 
 endef
 
-define gb_CppunitTest_set_args
-$$(call gb_Output_error,gb_CppunitTest_set_args: use gb_CppunitTest_add_arguments instead.))
-endef
-
 # Add additional command line arguments for the test.
 #
 # You should practically never need to use this, as there are special
@@ -153,10 +149,6 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS += $(2)
 
 endef
 
-define gb_CppunitTest_uses_ure
-$$(call gb_Output_error,gb_CppunitTest_uses_ure: use gb_CppunitTest_use_ure instead.))
-endef
-
 define gb_CppunitTest_use_ure
 $(call gb_CppunitTest_use_rdb,$(1),ure/services)
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
@@ -168,32 +160,12 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,cppuhelper
 
 endef
 
-define gb_CppunitTest_add_type_rdb
-$$(call gb_Output_error,\
- gb_CppunitTest_add_type_rdb: use gb_CppunitTest_use_api instead.)
-endef
-
-define gb_CppunitTest_use_type_rdb
-$$(call gb_Output_error,\
- gb_CppunitTest_use_type_rdb: use gb_CppunitTest_use_api instead.)
-endef
-
 define gb_CppunitTest__use_api
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(call gb_UnoApi_get_target,$(2))
 
 endef
 
-define gb_CppunitTest_add_type_rdbs
-$$(call gb_Output_error,\
- gb_CppunitTest_add_type_rdbs: use gb_CppunitTest_use_api instead.)
-endef
-
-define gb_CppunitTest_use_type_rdbs
-$$(call gb_Output_error,\
- gb_CppunitTest_use_type_rdbs: use gb_CppunitTest_use_api instead.)
-endef
-
 define gb_CppunitTest_use_api
 $(call gb_LinkTarget_use_api,$(call gb_CppunitTest_get_linktarget,$(1)),$(2))
 $(foreach rdb,$(2),$(call gb_CppunitTest__use_api,$(1),$(rdb)))
@@ -210,40 +182,17 @@ $(call gb_CppunitTest_use_api,$(1),udkapi offapi)
 
 endef
 
-define gb_CppunitTest_add_service_rdb
-$$(call gb_Output_error,\
- gb_CppunitTest_add_service_rdb: use gb_CppunitTest_use_rdb instead.)
-endef
-
-define gb_CppunitTest_use_service_rdb
-$$(call gb_Output_error,gb_CppunitTest_use_service_rdb: use gb_CppunitTest_use_rdb instead.))
-endef
-
 define gb_CppunitTest_use_rdb
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Rdb_get_target_for_build,$(2))
 $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(call gb_Rdb_get_target_for_build,$(2))
 
 endef
 
-define gb_CppunitTest_add_service_rdbs
-$$(call gb_Output_error,\
- gb_CppunitTest_add_service_rdbs: use gb_CppunitTest_use_rdbs instead.)
-endef
-
-define gb_CppunitTest_use_service_rdbs
-$$(call gb_Output_error,gb_CppunitTest_use_service_rdbs: use gb_CppunitTest_use_rdbs instead.))
-endef
-
 define gb_CppunitTest_use_rdbs
 $(foreach rdb,$(2),$(call gb_CppunitTest_use_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_target,$(2))
@@ -266,11 +215,6 @@ $(filter-out \
 		forms/util/frm),$(1))
 endef
 
-define gb_CppunitTest_add_components
-$$(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)))
 
@@ -316,13 +260,9 @@ $(eval $(foreach method,\
 	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_objcobject \
 	add_objcobjects \
@@ -330,11 +270,9 @@ $(eval $(foreach method,\
 	add_objcxxobjects \
 	add_asmobject \
 	add_asmobjects \
-	add_package_headers \
 	use_package \
 	use_packages \
 	set_precompiled_header \
-	add_precompiled_header \
 	add_sdi_headers \
 	add_cflags \
 	set_cflags \
@@ -343,7 +281,6 @@ $(eval $(foreach method,\
 	add_objcflags \
 	add_objcxxflags \
 	add_defs \
-	set_defs \
 	set_include \
 	add_ldflags \
 	set_ldflags \
@@ -355,8 +292,6 @@ $(eval $(foreach method,\
 	use_internal_bootstrap_api \
 	use_internal_comprehensive_api \
 	set_library_path_flags \
-	set_objcflags \
-	set_objcxxflags \
 	use_external \
 	use_externals \
 	use_custom_headers \

solenv/gbuild/Executable.mk

@@ -85,10 +85,6 @@ define gb_Executable_set_targettype_gui
 $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,$(1))) : TARGETGUI := $(2)
 endef
 
-define gb_Executable_add_auxtarget
-$(call gb_Output_error,gb_Executable_add_auxtarget should no longer be necessary)
-endef
-
 define gb_Executable_forward_to_Linktarget
 gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Executable_get_linktarget,$$(1)),$$(2),$$(3),Executable_$$(1))
 
@@ -112,15 +108,10 @@ $(eval $(foreach method,\
 	add_generated_cxxobjects \
 	add_generated_exception_objects \
 	add_cflags \
-	set_cflags \
 	add_cxxflags \
-	set_cxxflags \
 	add_objcflags \
 	add_objcxxflags \
-	set_objcflags \
-	set_objcxxflags \
 	add_defs \
-	set_defs \
 	set_include \
 	add_ldflags \
 	set_ldflags \
@@ -132,27 +123,19 @@ $(eval $(foreach method,\
 	use_api \
 	use_sdk_api \
 	use_udk_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 \
 	use_package \
 	use_packages \
 	use_unpacked \
 	add_sdi_headers \
 	set_precompiled_header \
-	add_precompiled_header \
 	add_nativeres \
 	set_warnings_not_errors \
 	set_generated_cxx_suffix \

solenv/gbuild/Jar.mk

@@ -167,18 +167,7 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_generated_sourcefile,$(1),$(sourcefi
 
 endef
 
-define gb_JarTest_set_classpath
-$$(call gb_Output_error,\
- gb_JarTest_set_classpath: use gb_JavaClassSet_add_classpath instead.)
-endef
-
 # JARCLASSPATH is the class path that is written to the manifest of the jar
-define gb_Jar_set_jarclasspath
-$$(call gb_Output_error,\
- gb_Jar_set_jarclasspath: use gb_Jar_add_manifest_classpath instead.)
-
-endef
-
 define gb_Jar_add_manifest_classpath
 $(call gb_Jar_get_target,$(1)) : JARCLASSPATH += $(2)
 
@@ -193,11 +182,6 @@ $(call gb_Jar_get_target,$(1)) : $(2)
 
 endef
 
-define gb_Jar_add_jar
-$$(call gb_Output_error,\
- gb_Jar_add_jar: use gb_Jar_use_jar instead.)
-endef
-
 # URE jars are not added to manifest classpath; and neither is unoil.jar, which
 # is available at runtime via URE_MORE_JAVA_TYPES:
 gb_Jar_default_jars := $(gb_Jar_URE) unoil
@@ -210,11 +194,6 @@ $(if $(filter-out $(gb_Jar_default_jars),$(2)),\
 
 endef
 
-define gb_Jar_add_system_jar
-$$(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))
 $(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2)))
@@ -229,22 +208,12 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(3))
 
 endef
 
-define gb_Jar_add_jars
-$$(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
 $(foreach jar,$(2),$(call gb_Jar_use_jar,$(1),$(jar)))
 
 endef
 
-define gb_Jar_add_system_jars
-$$(call gb_Output_error,\
- gb_Jar_add_system_jars: use gb_Jar_use_system_jars instead.)
-endef
-
 define gb_Jar_use_system_jars
 $(foreach jar,$(2),$(call gb_Jar_use_system_jar,$(1),$(jar)))
 
@@ -264,21 +233,11 @@ $(foreach external,$(2),$(call gb_Jar_use_external,$(1),$(external)))
 
 endef
 
-define gb_Jar_add_customtarget_dependency
-$$(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
-$$(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)))
 

solenv/gbuild/JavaClassSet.mk

@@ -100,21 +100,11 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_generated_sourcefile,$(1),$
 
 endef
 
-define gb_JavaClassSet_set_classpath
-$$(call gb_Output_error,\
- gb_JavaClassSet_set_classpath: use gb_JavaClassSet_add_classpath instead.)
-endef
-
 define gb_JavaClassSet_add_classpath
 $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2))
 
 endef
 
-define gb_JavaClassSet_add_jar
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.)
-endef
-
 define gb_JavaClassSet_use_jar
 ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
 $$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
@@ -127,41 +117,21 @@ $(call gb_JavaClassSet_add_classpath,$(1),$(call gb_Jar_get_target,$(2)))
 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_add_classpath,$(1),$(2))
 
 endef
 
-define gb_JavaClassSet_add_jars
-$$(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
-$$(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
 
-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
@@ -175,21 +145,6 @@ $(call gb_JavaClassSet_add_classpath,$(1),$(call gb_JavaClassSet_get_classdir,$(
 
 endef
 
-define gb_JavaClassSet_use_external
-$$(call gb_Output_error,\
- gb_JavaClassSet_use_external: use gb_Jar_use_external instead.)
-endef
-
-define gb_JavaClassSet_use_externals
-$(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))

solenv/gbuild/JunitTest.mk

@@ -95,11 +95,6 @@ $(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile))
 
 endef
 
-define gb_JunitTest_add_jar
-$$(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)$(call gb_Jar_get_target,$(2))
@@ -107,21 +102,11 @@ $(call gb_JunitTest_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
 
 endef
 
-define gb_JunitTest_add_jars
-$$(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
 
-define gb_JunitTest_add_jar_classset
-$$(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))
@@ -153,22 +138,12 @@ $(foreach external,$(2),$(call gb_JunitTest_use_external,$(1),$(external)))
 
 endef
 
-define gb_JunitTest_add_customtarget_dependency
-$$(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))
 $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_CustomTarget_get_workdir,$(2))
 
 endef
 
-define gb_JunitTest_add_customtarget_dependencies
-$$(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)))
 

solenv/gbuild/Library.mk

@@ -97,14 +97,6 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library_get_ex
 
 endef
 
-define gb_Library_add_auxtarget
-$(call gb_Output_error,gb_Library_add_auxtarget should no longer be necessary)
-endef
-
-define gb_Library_add_auxtargets
-$(call gb_Output_error,gb_Library_add_auxtargets should no longer be necessary)
-endef
-
 # we actually (ab)use ILIBTARGET here to store the unversioned symlink -
 # it serves a similar purpose to an MSVC import library, as input for linker
 # call gb_Library__add_soversion_link,library,linkname
@@ -193,22 +185,16 @@ $(eval $(foreach method,\
 	add_generated_cobjects \
 	add_generated_cxxobjects \
 	add_generated_exception_objects \
-	add_library_objects \
 	use_library_objects \
 	add_grammar \
 	add_grammars \
 	add_scanner \
 	add_scanners \
 	add_cflags \
-	set_cflags \
 	add_cxxflags \
-	set_cxxflags \
 	add_objcxxflags \
 	add_objcflags \
-	set_objcflags \
-	set_objcxxflags \
 	add_defs \
-	set_defs \
 	set_include \
 	add_ldflags \
 	set_ldflags \
@@ -221,28 +207,20 @@ $(eval $(foreach method,\
 	use_api \
 	use_sdk_api \
 	use_udk_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 \
 	use_package \
 	use_packages \
 	use_unpacked \
 	use_restarget \
-	add_package_headers \
 	add_sdi_headers \
 	set_precompiled_header \
-	add_precompiled_header \
 	export_objects_list \
 	add_nativeres \
 	set_nativeres \

solenv/gbuild/LinkTarget.mk

@@ -627,54 +627,22 @@ $(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
 $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
 endef
 
-define gb_LinkTarget_set_defs
-$$(call gb_Output_error,\
- gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
-endif
-
-endef
-
 # call gb_LinkTarget_add_cflags,linktarget,cflags
 define gb_LinkTarget_add_cflags
 $(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND += $(2)
 endef
 
-define gb_LinkTarget_set_cflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
-endif
-
-endef
-
 # call gb_LinkTarget_add_cxxflags,linktarget,cxxflags
 define gb_LinkTarget_add_cxxflags
 $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
 $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
 endef
 
-define gb_LinkTarget_set_cxxflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
-
-endef
-
 # call gb_LinkTarget_add_objcxxflags,linktarget,objcxxflags
 define gb_LinkTarget_add_objcxxflags
 $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2)
 endef
 
-define gb_LinkTarget_set_objcxxflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
-
-endef
-
-define gb_LinkTarget_set_objcflags
-$$(call gb_Output_error,\
- gb_LinkTarget_set_objcflags: use gb_LinkTarget_add_objcflags instead.)
-
-endef
-
 # call gb_LinkTarget_add_objcflags,linktarget,objcflags
 define gb_LinkTarget_add_objcflags
 $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND += $(2)
@@ -702,11 +670,6 @@ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
 
 endef
 
-define gb_LinkTarget_set_include_stl
-$$(call gb_Output_error,\
- gb_LinkTarget_set_include_stl: removed, why is anybody calling it?)
-endef
-
 # call gb_LinkTarget_add_ldflags,linktarget,ldflags
 define gb_LinkTarget_add_ldflags
 $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
@@ -773,21 +736,6 @@ $(foreach api,$(2),$(call gb_LinkTarget__use_internal_api_one,$(1),$(api),$(3)))
 
 endef
 
-define gb_LinkTarget_add_internal_api
-$$(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_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_Output_error,\
- gb_LinkTarget_add_internal_comprehensive_api: use gb_LinkTarget_use_internal_comprehensive_api instead.)
-endef
-
 # call gb_LinkTarget_use_internal_api,linktarget,api
 define gb_LinkTarget_use_internal_api
 $(call gb_LinkTarget__use_internal_api,$(1),$(2))
@@ -806,11 +754,6 @@ $(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_PrintDeps_info
 $(info LibraryDep: $(1) links against $(2))
 endef
@@ -898,11 +841,6 @@ endif
 
 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
-
 # avoid problem when a module is built partially but other modules that define
 # needed static libraries is not yet built: prevent invocation of pattern rule
 # for static library with invalid parameters by depending on the header target
@@ -1116,11 +1054,6 @@ define gb_LinkTarget_add_exception_object
 $(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)))
 endef
 
-define gb_LinkTarget_add_linktarget_objects
-$$(call gb_Output_error,\
- gb_LinkTarget_add_linktarget_objects: use gb_LinkTarget__use_linktarget_objects instead.)
-endef
-
 # call gb_LinkTarget__use_linktarget_objects,linktarget,linktargets
 define gb_LinkTarget__use_linktarget_objects
 $(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
@@ -1130,11 +1063,6 @@ 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
-
 # call gb_LinkTarget_use_library_objects,linktarget,libs
 define gb_LinkTarget_use_library_objects
 ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
@@ -1147,11 +1075,6 @@ $(call gb_LinkTarget_get_headers_target,$(1)) : \
 
 endef
 
-define gb_LinkTarget_add_executable_objects
-$$(call gb_Output_error,\
- gb_LinkTarget_add_executable_objects: use gb_LinkTarget_use_executable_objects instead.)
-endef
-
 # call gb_LinkTarget_use_executable_objects,linktarget,exes
 define gb_LinkTarget_use_executable_objects
 $(call gb_LinkTarget__use_linktarget_objects,$(1),$(foreach exe,$(2),$(call gb_Executable_get_linktarget,$(exe))))
@@ -1241,11 +1164,6 @@ $(call gb_LinkTarget_get_target,$(1)) : ILIBTARGET := $(2)
 
 endef
 
-define gb_LinkTarget_set_auxtargets
-$$(call gb_Output_error,\
- gb_LinkTarget_set_auxtargets: use gb_LinkTarget_add_auxtargets instead.)
-endef
-
 # Add a file that is built by the LinkTarget command and define
 # a dummy touch rule for it so it can be tracked via dependencies.
 # The assumption is that the file is created by linking; in case it does not
@@ -1273,11 +1191,6 @@ $(foreach aux,$(2),$(call gb_LinkTarget_add_auxtarget,$(1),$(aux)))
 
 endef
 
-define gb_LinkTarget_add_custom_headers
-$$(call gb_Output_error,\
- gb_LinkTarget_add_custom_headers: use gb_LinkTarget_use_custom_headers instead.)
-endef
-
 # call gb_LinkTarget__use_custom_headers,linktarget,customtarget
 define gb_LinkTarget__use_custom_headers
 $(call gb_LinkTarget_get_headers_target,$(1)) :| \
@@ -1292,11 +1205,6 @@ $(foreach customtarget,$(2),$(call gb_LinkTarget__use_custom_headers,$(1),$(cust
 
 endef
 
-define gb_LinkTarget_add_package_headers
-$$(call gb_Output_error,\
- gb_LinkTarget_add_package_headers: use gb_LinkTarget_use_package instead.)
-endef
-
 # add SDI (svidl) headers
 # call gb_LinkTarget_add_sdi_headers,linktarget,sditargets
 define gb_LinkTarget_add_sdi_headers
@@ -1337,11 +1245,6 @@ endif
 
 endef
 
-define gb_LinkTarget_add_precompiled_header
-$$(call gb_Output_error,\
- gb_LinkTarget_add_precompiled_header: use gb_LinkTarget_set_precompiled_header instead.)
-endef
-
 # use a header package, possibly from another module
 # call gb_LinkTarget_use_package,linktarget,package
 define gb_LinkTarget_use_package

solenv/gbuild/Rdb.mk

@@ -53,11 +53,6 @@ $(call gb_Helper_install_final, \
 
 endef
 
-define gb_Rdb_install
-$(error gb_Rdb_install removed use gb_Rdb_Rdb_install instead)
-
-endef
-
 define gb_Rdb_add_component
 $(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)

solenv/gbuild/StaticLibrary.mk

@@ -71,14 +71,10 @@ $(eval $(foreach method,\
 	add_generated_cxxobjects \
 	add_generated_exception_objects \
 	add_cflags \
-	set_cflags \
 	add_cxxflags \
-	set_cxxflags \
 	add_objcflags \
 	add_objcxxflags \
-	set_objcxxflags \
 	add_defs \
-	set_defs \
 	set_include \
 	add_ldflags \
 	set_ldflags \
@@ -93,9 +89,7 @@ $(eval $(foreach method,\
 	use_internal_comprehensive_api \
 	use_external \
 	use_externals \
-	add_custom_headers \
 	use_custom_headers \
-	add_package_headers \
 	use_package \
 	use_packages \
 	use_unpacked \
@@ -103,7 +97,6 @@ $(eval $(foreach method,\
 	use_static_libraries \
 	add_sdi_headers \
 	set_precompiled_header \
-	add_precompiled_header \
 	set_warnings_not_errors \
 	set_generated_cxx_suffix \
 ,\

solenv/gbuild/UnoApiTarget.mk

@@ -208,10 +208,6 @@ $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApi
 
 endef
 
-define gb_UnoApiHeadersTarget_add_rdbfile
-$$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfile: use gb_UnoApiHeadersTarget_use_api instead.)
-endef
-
 define gb_UnoApiHeadersTarget__use_api
 $(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),target)
 $(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),bootstrap_target)
@@ -219,10 +215,6 @@ $(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),comprehensive_target
 
 endef
 
-define gb_UnoApiHeadersTarget_add_rdbfiles
-$$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfiles: use gb_UnoApiHeadersTarget_use_api instead.)
-endef
-
 define gb_UnoApiHeadersTarget_use_api
 $(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget__use_api,$(1),$(rdb)))
 

solenv/gbuild/WinResTarget.mk

@@ -66,10 +66,6 @@ $(call gb_WinResTarget_get_clean_target,%) :
 		rm -f $(call gb_WinResTarget_get_target,$*) \
 			$(call gb_WinResTarget_get_dep_target,$*))
 
-define gb_WinResTarget_set_defs
-$$(call gb_Output_error,gb_WinResTarget_set_defs: use gb_WinResTarget_add_defs instead.)
-endef
-
 define gb_WinResTarget_add_defs
 $(call gb_WinResTarget_get_target,$(1)) : DEFS += $(2)
 
@@ -97,10 +93,6 @@ endif
 
 endef
 
-define gb_WinResTarget_add_file
-$$(call gb_Output_error,gb_WinResTarget_add_file: use gb_WinResTarget_set_rcfile instead.)
-endef
-
 define gb_WinResTarget_set_rcfile
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE := $(SRCDIR)/$(strip $(2)).rc