UnoApiTarget: replace realpath calls

6 files changed, 17 insertions, 10 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8ae72cb5579b..1f3ab3235576 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi,SRCDIR))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
     udkapi \
diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk
index df0da0603c27..02b9953ce1f6 100644
--- a/offapi/UnoApi_types.mk
+++ b/offapi/UnoApi_types.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types,SRCDIR))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
     udkapi \
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 340c5d0a3991..c204aa6dbbee 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi,SRCDIR))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\
     udkapi \
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index a888e0ceb40e..3f87fae1b04d 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -47,6 +47,10 @@ $(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_ta
 	mkdir -p $$(dir $$@)
 
 define gb_UnoApiTarget_UnoApiTarget
+$(if $(filter $(2),$(gb_Helper_REPOSITORYNAMES)),,\
+ $(error UnoApiTarget: no or invalid repository given; known repositories: \
+  $(gb_Helper_REPOSITORYNAMES)))
+gb_UnoApiTarget_REPO_$(1) := $(2)
 $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
 $(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
 $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
@@ -62,7 +66,8 @@ endef
 define gb_UnoApiTarget_add_idlfiles
 $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
 
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach repo,$(gb_REPOS),$(foreach idl,$(3),$(realpath $(repo)/$(2)/$(idl).idl)))
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
+		$(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
 	$(gb_UnoApiPartTarget__command)
 
 endef
@@ -82,7 +87,8 @@ endef
 define gb_UnoApiTarget_add_idlfiles_noheader
 $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl)))
 
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach repo,$(gb_REPOS),$(foreach idl,$(3),$(realpath $(repo)/$(2)/$(idl).idl)))
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : \
+		$(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
 	$(gb_UnoApiPartTarget__command)
 
 endef
@@ -97,7 +103,8 @@ endef
 define gb_UnoApiTarget_add_idlfiles_nohdl
 $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl)))
 
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach repo,$(gb_REPOS),$(foreach idl,$(3),$(realpath $(repo)/$(2)/$(idl).idl)))
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : \
+		$(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
 	$(gb_UnoApiPartTarget__command)
 
 endef
@@ -136,9 +143,9 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$
 
 endef
 
-#UNOAPI_REFERENCE_$(1) := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
 define gb_UnoApiTarget_add_reference_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
+$(call gb_UnoApiTarget_get_target,$(1)) : \
+	UNOAPI_REFERENCE := $($(gb_UnoApiTarget_REPO_$(1)))/$(strip $(2)).rdb
 
 endef
 
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index fb1ac947187e..1572c1301cbb 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi,SRCDIR))
 
 $(eval $(call gb_UnoApiTarget_set_include,udkapi,\
 	$$(INCLUDE) \
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk
index d61d07912ec2..ad5c8f132707 100644
--- a/udkapi/UnoApi_uretypes.mk
+++ b/udkapi/UnoApi_uretypes.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types,SRCDIR))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
     udkapi \