gbuild: "use" vs. "add"

9 files changed, 81 insertions, 27 deletions

diff --git a/offapi/UnoApiMerge_types.mk b/offapi/UnoApiMerge_types.mk
index a97945d3dfe5..85af0c3e4184 100644
--- a/offapi/UnoApiMerge_types.mk
+++ b/offapi/UnoApiMerge_types.mk
@@ -28,12 +28,12 @@
 
 $(eval $(call gb_UnoApiMerge_UnoApiMerge,types))
 
-$(eval $(call gb_UnoApiMerge_add_rdbfiles,types,\
+$(eval $(call gb_UnoApiMerge_use_api,types,\
     udkapi \
     offapi \
 ))
 
-$(eval $(call gb_UnoApiMerge_add_reference_rdbfile,types,\
+$(eval $(call gb_UnoApiMerge_set_reference_rdbfile,types,\
     offapi/type_reference/types \
 ))
 
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 1a47d4943c59..d533eb3cddf4 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_UnoApi_UnoApi,offapi))
 
-$(eval $(call gb_UnoApi_add_api,offapi,\
+$(eval $(call gb_UnoApi_use_api,offapi,\
     udkapi \
 ))
 
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 6447d9b62ae0..ec8d8f4e68e1 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_UnoApi_UnoApi,oovbaapi))
 
-$(eval $(call gb_UnoApi_add_api,oovbaapi,\
+$(eval $(call gb_UnoApi_use_api,oovbaapi,\
     udkapi \
     offapi \
 ))
diff --git a/scaddins/InternalUnoApi_scaddins.mk b/scaddins/InternalUnoApi_scaddins.mk
index ad796648fdfb..6be02012c2b8 100644
--- a/scaddins/InternalUnoApi_scaddins.mk
+++ b/scaddins/InternalUnoApi_scaddins.mk
@@ -27,12 +27,12 @@
 
 $(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins))
 
-$(eval $(call gb_InternalUnoApi_add_api,scaddins,\
+$(eval $(call gb_InternalUnoApi_use_api,scaddins,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_add_api_dependencies,scaddins,offapi,\
+$(eval $(call gb_InternalUnoApi_define_api_dependencies,scaddins,offapi,\
     udkapi \
 ))
 
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 163e7a064090..f8271097c583 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -45,7 +45,7 @@ $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
 
 $(call gb_UnoApiTarget_set_root,$(1)_out,/)
 $(call gb_UnoApiTarget_set_root,$(1),UCR)
-$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(1)_out)
+$(call gb_UnoApiTarget_merge_api,$(1),$(1)_out)
 
 $(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
 $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out)
@@ -68,15 +68,23 @@ $(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3))
 
 endef
 
-define gb_InternalUnoApi__add_api
-$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2))
+define gb_InternalUnoApi__use_api
+$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
 $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
 
 endef
 
 define gb_InternalUnoApi_add_api
-$(foreach rdb,$(2),$(call gb_InternalUnoApi__add_api,$(1),$(rdb)))
+$$(call gb_Output_error,gb_InternalUnoApi_add_api: use gb_InternalUnoApi_use_api instead.)
+endef
+
+define gb_InternalUnoApi_use_api
+$(foreach rdb,$(2),$(call gb_InternalUnoApi__use_api,$(1),$(rdb)))
+
+endef
 
+define gb_InternalUnoApi_add_api_dependency
+$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependency: use gb_InternalUnoApi_define_api_dependency instead.)
 endef
 
 # Express that the rdb $(2) depends on rdb $(3).
@@ -89,13 +97,17 @@ endef
 # I suppose it would be possible to store the list of required rdbs for
 # a rdb to a file and then load it when headers' generation is requested,
 # but it feels like overkill...
-define gb_InternalUnoApi_add_api_dependency
-$(call gb_UnoApiHeadersTarget_add_rdbfile,$(2),$(3))
+define gb_InternalUnoApi_define_api_dependency
+$(call gb_UnoApiHeadersTarget_use_api,$(2),$(3))
 
 endef
 
 define gb_InternalUnoApi_add_api_dependencies
-$(foreach dep,$(3),$(call gb_InternalUnoApi_add_api_dependency,$(1),$(2),$(dep)))
+$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependencies: use gb_InternalUnoApi_define_api_dependencies instead.)
+endef
+
+define gb_InternalUnoApi_define_api_dependencies
+$(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(dep)))
 
 endef
 
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index fba9b1f7643f..2b51f8c9750a 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -130,19 +130,28 @@ $(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl)))
 
 endef
 
-define gb_UnoApi__add_api
-$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2))
+define gb_UnoApi__use_api
+$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
 $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
 
 endef
 
 define gb_UnoApi_add_api
-$(foreach rdb,$(2),$(call gb_UnoApi__add_api,$(1),$(rdb)))
+$$(call gb_Output_error,gb_UnoApi_add_api: use gb_UnoApi_use_api instead.)
+endef
+
+define gb_UnoApi_use_api
+$(foreach rdb,$(2),$(call gb_UnoApi__use_api,$(1),$(rdb)))
 
 endef
 
 define gb_UnoApi_add_reference_rdbfile
-$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2))
+$$(call gb_Output_error,gb_UnoApi_add_reference_rdbfile: use gb_UnoApi_set_reference_rdbfile instead.)
+
+endef
+
+define gb_UnoApi_set_reference_rdbfile
+$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
 
 endef
 
diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk
index 5b4fafb5f2fd..3ce9ad55f8c2 100644
--- a/solenv/gbuild/UnoApiMerge.mk
+++ b/solenv/gbuild/UnoApiMerge.mk
@@ -45,17 +45,30 @@ $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1))
 endef
 
 define gb_UnoApiMerge_add_rdbfile
-$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(2))
+$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfile: use gb_UnoApiMerge_use_api instead.)
+endef
+
+define gb_UnoApiMerge__use_api
+$(call gb_UnoApiTarget_merge_api,$(1),$(2))
 
 endef
 
 define gb_UnoApiMerge_add_rdbfiles
-$(foreach rdb,$(2),$(call gb_UnoApiMerge_add_rdbfile,$(1),$(rdb)))
+$$(call gb_Output_error,gb_UnoApiMerge_add_rdbfiles: use gb_UnoApiMerge_use_api instead.)
+endef
+
+define gb_UnoApiMerge_use_api
+$(foreach rdb,$(2),$(call gb_UnoApiMerge__use_api,$(1),$(rdb)))
 
 endef
 
 define gb_UnoApiMerge_add_reference_rdbfile
-$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2))
+$$(call gb_Output_error,gb_UnoApiMerge_add_reference_rdbfile: use gb_UnoApiMerge_set_reference_rdbfile instead.)
+
+endef
+
+define gb_UnoApiMerge_set_reference_rdbfile
+$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
 
 endef
 
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 8192d26b88f2..fdbe5a4da067 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -223,11 +223,19 @@ $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
 endef
 
 define gb_UnoApiTarget_merge_rdbfiles
-$(foreach rdb,$(2),$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(rdb)))
+$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfiles: use gb_UnoApiTarget_merge_api instead.)
+endef
+
+define gb_UnoApiTarget_merge_api
+$(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb)))
 
 endef
 
 define gb_UnoApiTarget_merge_rdbfile
+$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfile: use gb_UnoApiTarget_merge_api instead.)
+endef
+
+define gb_UnoApiTarget__merge_api
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiTarget_get_target,$(2))
 $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
 
@@ -242,6 +250,10 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XMLRDB)
 endef
 
 define gb_UnoApiTarget_add_reference_rdbfile
+$$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarget_set_reference_rdbfile instead.)
+endef
+
+define gb_UnoApiTarget_set_reference_rdbfile
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
 
 endef
@@ -311,21 +323,29 @@ define gb_UnoApiHeadersTarget_add_headerfile
 
 endef
 
-define gb_UnoApiHeadersTarget__add_rdbfile
+define gb_UnoApiHeadersTarget__use_api_for_target
 $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
 $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2))
 
 endef
 
 define gb_UnoApiHeadersTarget_add_rdbfile
-$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target)
-$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),bootstrap_target)
-$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target)
+$$(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)
+$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),comprehensive_target)
 
 endef
 
 define gb_UnoApiHeadersTarget_add_rdbfiles
-$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(rdb)))
+$$(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)))
 
 endef
 
diff --git a/udkapi/UnoApiMerge_uretypes.mk b/udkapi/UnoApiMerge_uretypes.mk
index 3b01834f9c3a..e56ea27e4fcf 100644
--- a/udkapi/UnoApiMerge_uretypes.mk
+++ b/udkapi/UnoApiMerge_uretypes.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types))
 
-$(eval $(call gb_UnoApiMerge_add_rdbfiles,ure/types,\
+$(eval $(call gb_UnoApiMerge_use_api,ure/types,\
     udkapi \
 ))