use runtime deps in gbuild classes

Change-Id: I007e0293c354d6f930dffb4a9a2c2df5640a673b

11 files changed, 76 insertions, 93 deletions

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 65105b6a39da..9e348e732980 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -47,9 +47,8 @@
 
 # SrsPartMergeTarget class
 
-gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build,transex3)
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
-	$(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(call gb_Executable_get_command,transex3)
 
 define gb_SrsPartMergeTarget__command
 $(call gb_Output_announce,$(3),$(true),srs,1)
@@ -67,7 +66,7 @@ rm -rf $${MERGEINPUT}
 
 endef
 
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXDEPS)
 	$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
 		$(call gb_SrsPartMergeTarget__command,$@,$*,$<),\
 		mkdir -p $(dir $@) && cp $< $@)
@@ -87,8 +86,8 @@ endef
 # defined by platform
 #  gb_SrsPartTarget__command_dep
 
-gb_ResTarget_RSCTARGET := $(call gb_Executable_get_target_for_build,rsc)
-gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET)
+gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
+gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc)
 
 define gb_SrsPartTarget__command
 $(call gb_Helper_abbreviate_dirs,\
@@ -106,7 +105,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 $(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) \
-		$(gb_ResTarget_RSCTARGET)
+		$(gb_ResTarget_RSCDEPS)
 	$(call gb_SrsPartTarget__command_dep,$*,$<)
 	$(call gb_SrsPartTarget__command,$@,$*,$<)
 
@@ -363,7 +362,7 @@ $(call gb_ResTarget_get_clean_target,%) :
 		rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*))
 
 $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
-		$(gb_ResTarget_RSCTARGET)
+		$(gb_ResTarget_RSCDEPS)
 	$(call gb_Output_announce,$*,$(true),RES,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) $(OUTDIR)/bin \
@@ -383,7 +382,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
 			-subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
 			-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
 			-oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
-			$(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCTARGET),$^)" \
+			$(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCDEPS),$^)" \
 			> $${RESPONSEFILE} && \
 		$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
 		rm -f $${RESPONSEFILE})
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index f72a4e088343..92e599cb4efc 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -11,8 +11,8 @@
 
 gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT)
 
-gb_CliUnoApiTarget_TARGET := $(call gb_Executable_get_target_for_build,climaker)
-gb_CliUnoApiTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_CliUnoApiTarget_TARGET)
+gb_CliUnoApiTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
+gb_CliUnoApiTarget_COMMAND := $(call gb_Executable_get_command,climaker)
 
 define gb_CliUnoApiTarget__command
 $(call gb_Output_announce,$(2),$(true),CLI,4)
@@ -35,13 +35,7 @@ $(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
 $(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-# TODO depending on the whole URE might be overkill, but I do not have a
-# Windows machine to debug it...
-$(call gb_CliUnoApiTarget_get_target,%) : \
-		$(gb_CliUnoApiTarget_TARGET) \
-		$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-		$(call gb_Package_get_target,cppuhelper_unorc) \
-		$(call gb_Rdb_get_outdir_target,ure/services)
+$(call gb_CliUnoApiTarget_get_target,%) : $(gb_CliUnoApiTarget_DEPS)
 	$(call gb_CliUnoApiTarget__command,$@,$*,$<)
 
 .PHONY : $(call gb_CliUnoApiTarget_get_clean_target,%)
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index db65dc582e5b..328c5a88a8c0 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -251,8 +251,8 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 
 # XcuMergeTarget class
 
-gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target_for_build,cfgex)
-gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET)
+gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfgex)
+gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
 
 # PRJNAME is computed from the stem (parameter $(2))
 define gb_XcuMergeTarget__command
@@ -271,7 +271,7 @@ rm -rf $${MERGEINPUT}
 
 endef
 
-$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET)
+$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXDEPS)
 	$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
 		$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),\
 		mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 55d11813ebb6..9c145b637a74 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -52,7 +52,8 @@ endif
 #  gb_CppunitTest_get_filename
 # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
 ifneq ($(CROSS_COMPILING),YES)
-gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
+gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
+gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_command,cppunit/cppunittester)
 endif
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
@@ -80,7 +81,7 @@ $(call gb_CppunitTest_get_clean_target,%) :
 		rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
 
 .PHONY : $(call gb_CppunitTest_get_target,%)
-$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
+$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
 	$(call gb_Output_announce,$*,$(true),CUT,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -91,7 +92,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
 		DISABLE_SAL_DBGBOX=t \
 		$(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \
 		STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \
-		$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \
+		$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
 		$(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) \
 		$(call gb_CppunitTest__make_args) \
 		$(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && $(UNIT_FAILED_MSG) && false))))
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 8e4e45c42c3e..b916da298f3b 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -11,8 +11,8 @@
 
 gb_ThesaurusIndexTarget_CHECK_TARGET := $(SRCDIR)/dictionaries/util/th_check.pl
 gb_ThesaurusIndexTarget_CHECK_COMMAND := PERL_UNICODE=0 $(PERL) -w $(gb_ThesaurusIndexTarget_CHECK_TARGET)
-gb_ThesaurusIndexTarget_INDEX_TARGET := $(call gb_Executable_get_target_for_build,idxdict)
-gb_ThesaurusIndexTarget_INDEX_COMMAND := $(gb_Helper_set_ld_path) $(gb_ThesaurusIndexTarget_INDEX_TARGET)
+gb_ThesaurusIndexTarget_INDEX_DEPS := $(call gb_Executable_get_runtime_dependencies,idxdict)
+gb_ThesaurusIndexTarget_INDEX_COMMAND := $(call gb_Executable_get_command,idxdict)
 
 define gb_ThesaurusIndexTarget__command
 $(call gb_Output_announce,$(2),$(true),THI,1)
@@ -28,7 +28,7 @@ $(dir $(call gb_ThesaurusIndexTarget_get_target,%)).dir :
 $(dir $(call gb_ThesaurusIndexTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_TARGET) | $(gb_ThesaurusIndexTarget_CHECK_TARGET)
+$(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_DEPS) | $(gb_ThesaurusIndexTarget_CHECK_TARGET)
 	$(call gb_ThesaurusIndexTarget__command,$@,$*)
 
 .PHONY : $(call gb_ThesaurusIndexTarget_get_clean_target,%)
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 4899e134902b..f21c2e177528 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -33,29 +33,21 @@
 gb_ExtensionTarget__get_preparation_target = $(WORKDIR)/ExtensionTarget/$(1).prepare
 
 gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
-gb_ExtensionTarget_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex)
-gb_ExtensionTarget_XRMEXCOMMAND := \
-	$(gb_Helper_set_ld_path) $(gb_ExtensionTarget_XRMEXTARGET)
-
-gb_ExtensionTarget_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propex)
-gb_ExtensionTarget_PROPMERGECOMMAND := \
-	$(gb_Helper_set_ld_path) $(gb_ExtensionTarget_PROPMERGETARGET)
-
-gb_ExtensionTarget_TREEXTARGET := $(call gb_Executable_get_target_for_build,treex)
-gb_ExtensionTarget_TREEXCOMMAND := \
-    $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_TREEXTARGET)
-
-gb_ExtensionTarget_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex)
-gb_ExtensionTarget_HELPEXCOMMAND := \
-	$(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPEXTARGET)
-gb_ExtensionTarget_HELPINDEXERTARGET := \
-    $(call gb_Executable_get_target_for_build,HelpIndexer)
-gb_ExtensionTarget_HELPINDEXERCOMMAND := \
-	$(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPINDEXERTARGET)
-gb_ExtensionTarget_HELPLINKERTARGET := \
-    $(call gb_Executable_get_target_for_build,HelpLinker)
-gb_ExtensionTarget_HELPLINKERCOMMAND := \
-	$(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPLINKERTARGET)
+gb_ExtensionTarget_XRMEXDEPS := $(call gb_Executable_get_runtime_dependencies,xrmex)
+gb_ExtensionTarget_XRMEXCOMMAND := $(call gb_Executable_get_command,xrmex)
+
+gb_ExtensionTarget_PROPMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,propex)
+gb_ExtensionTarget_PROPMERGECOMMAND := $(call gb_Executable_get_command,propmerge)
+
+gb_ExtensionTarget_TREEXDEPS := $(call gb_Executable_get_runtime_dependencies,treex)
+gb_ExtensionTarget_TREEXCOMMAND := $(call gb_Executable_get_command,treex)
+
+gb_ExtensionTarget_HELPEXDEPS := $(call gb_Executable_get_runtime_dependencies,helpex)
+gb_ExtensionTarget_HELPEXCOMMAND := $(call gb_Executable_get_command,helpex)
+gb_ExtensionTarget_HELPINDEXERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpIndexer)
+gb_ExtensionTarget_HELPINDEXERCOMMAND := $(call gb_Executable_get_command,HelpIndexer)
+gb_ExtensionTarget_HELPLINKERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpLinker)
+gb_ExtensionTarget_HELPLINKERCOMMAND := $(call gb_Executable_get_command,HelpLinker)
 # does not contain en-US because it is special cased in gb_ExtensionTarget_ExtensionTarget
 gb_ExtensionTarget_TRANS_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 gb_ExtensionTarget_ALL_LANGS := en-US $(gb_ExtensionTarget_TRANS_LANGS)
@@ -95,7 +87,7 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml :
 		mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \
 		cp -f $(LOCATION)/description.xml $@)
 else
-$(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_XRMEXTARGET)
+$(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_XRMEXDEPS)
 	$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
 	MERGEINPUT=`$(gb_MKTEMP)` && \
 	echo $(POFILES) > $${MERGEINPUT} && \
@@ -257,7 +249,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootd
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \
 		:| $(call gb_ExtensionTarget__get_preparation_target,$(1))
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
-		$(gb_ExtensionTarget_PROPMERGETARGET)
+		$(gb_ExtensionTarget_PROPMERGEDEPS)
 	$$(call gb_Output_announce,$(2),$(true),PRP,3)
 	$$(call gb_Helper_abbreviate_dirs, \
 		mkdir -p $$(dir $$@) && \
@@ -334,7 +326,7 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
 $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) :
 endif
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
-        $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \
+        $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXDEPS)) | \
         $(call gb_ExtensionTarget_get_workdir,$(1))/help/.dir
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
         $(2)/$(or $(4),$(3))
@@ -376,7 +368,7 @@ endif
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
         $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
-        $(gb_ExtensionTarget_TREEXTARGET) | \
+        $(gb_ExtensionTarget_TREEXDEPS) | \
         $(2)/$(4)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
         $(2)/$(or $(4),$(3))
@@ -403,8 +395,8 @@ endef
 #     gb_ExtensionTarget_add_helpfile)
 define gb_ExtensionTarget__compile_help_onelang
 $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done : \
-        $(gb_ExtensionTarget_HELPINDEXERTARGET) \
-        $(gb_ExtensionTarget_HELPLINKERTARGET) \
+        $(gb_ExtensionTarget_HELPINDEXERDEPS) \
+        $(gb_ExtensionTarget_HELPLINKERDEPS) \
         $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
         $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \
         $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl | \
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index e7c6b06d975a..fca80c1481a0 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -74,8 +74,8 @@ endef
 
 # ScpPreprocessTarget class
 
-gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp)
-gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET)
+gb_ScpPreprocessTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,cpp)
+gb_ScpPreprocessTarget_COMMAND := $(call gb_Executable_get_command,cpp)
 
 gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp
 
@@ -93,7 +93,7 @@ endef
 $(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_TARGET)
+$(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_DEPS)
 	$(call gb_ScpPreprocessTarget__command,$@,$*)
 
 .PHONY : $(call gb_ScpPreprocessTarget_get_clean_target,%)
@@ -111,8 +111,8 @@ endef
 
 # ScpMergeTarget class
 
-gb_ScpMergeTarget_TARGET := $(call gb_Executable_get_target_for_build,ulfex)
-gb_ScpMergeTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpMergeTarget_TARGET)
+gb_ScpMergeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfex)
+gb_ScpMergeTarget_COMMAND := $(call gb_Executable_get_command,ulfex)
 
 gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf
 
@@ -129,7 +129,7 @@ endef
 $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
+$(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_DEPS)
 	$(call gb_ScpMergeTarget__command,$@,$*)
 
 .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%)
@@ -155,8 +155,8 @@ endef
 # platform:
 #  gb_ScpConvertTarget_ScpConvertTarget_platform
 
-gb_ScpConvertTarget_TARGET := $(call gb_Executable_get_target_for_build,ulfconv)
-gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpConvertTarget_TARGET)
+gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv)
+gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv)
 
 define gb_ScpConvertTarget__command
 $(call gb_Output_announce,$(2),$(true),SCC,1)
@@ -168,7 +168,7 @@ endef
 $(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_TARGET)
+$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_DEPS)
 	$(call gb_ScpConvertTarget__command,$@,$*)
 
 .PHONY : $(call gb_ScpConvertTarget_get_clean_target,%)
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d03226c5059f..2fb94f0ce0a4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -419,7 +419,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(8),$(call gb_GenCObject_get_dep_target,$(object))) \
 		$(foreach object,$(9),$(call gb_GenCxxObject_get_dep_target,$(object))) \
 		) && \
-	$(call gb_Executable_get_target_for_build,concat-deps) $${RESPONSEFILE} > $(1)) && \
+	$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
 	rm -f $${RESPONSEFILE}
 
 endef
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 43e38ab76c96..6ecc79d133c9 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -31,11 +31,10 @@
 # (This can be workarounded by using gb_Package, but really should not.)
 
 # SdiTarget class
-gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
-gb_SdiTarget_SVIDLCOMMAND := \
-	$(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET)
+gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
+gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)
 
-$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLTARGET)
+$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
 	$(call gb_Output_announce,$*,$(true),SDI,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) $(dir $(call gb_SdiTarget_get_dep_target,$*)))
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 4fdde7c82d1a..1662481391a8 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -13,8 +13,8 @@
 
 gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
 
-gb_UILocalizeTarget_TARGET := $(call gb_Executable_get_target_for_build,uiex)
-gb_UILocalizeTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_UILocalizeTarget_TARGET)
+gb_UILocalizeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,uiex)
+gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex)
 
 # If translatable strings from a .ui file are not merged into the
 # respective .po file yet, the produced translated files are empty (that
@@ -51,7 +51,7 @@ $(dir $(call gb_UILocalizeTarget_get_target,%)).dir :
 $(dir $(call gb_UILocalizeTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_TARGET)
+$(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_DEPS)
 	$(call gb_UILocalizeTarget__command,$@,$*)
 
 .PHONY : $(call gb_UILocalizeTarget_get_clean_target,%)
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 4f2f88d529f6..13f4aaf28e67 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -28,8 +28,8 @@
 
 # UnoApiPartTarget
 
-gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc)
-gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET)
+gb_UnoApiPartTarget_IDLCDEPS := $(call gb_Executable_get_runtime_dependencies,idlc)
+gb_UnoApiPartTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,idlc)
 
 # The .urd files are actually created by the gb_UnoApiPartTarget__command,
 # invoked for the per-directory .done files.
@@ -70,10 +70,8 @@ endef
 # If idlc changed, rebuild everything; otherwise just the changed files.
 # In order for this to work the .urd files need to have a dependency on
 # idlc as well so their dummy rule fires if that changes.
-$(call gb_UnoApiPartTarget_get_target,%.done) : \
-		$(gb_UnoApiPartTarget_IDLCTARGET) \
-		| $(call gb_ExternalExecutable_get_dependencies,ucpp)
-	$(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCTARGET),$(if $(filter $(gb_UnoApiPartTarget_IDLCTARGET),$?),$^,$?)))
+$(call gb_UnoApiPartTarget_get_target,%.done) : $(gb_UnoApiPartTarget_IDLCDEPS)
+	$(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCDEPS),$(if $(filter $(gb_UnoApiPartTarget_IDLCDEPS),$?),$^,$?)))
 
 ifeq ($(gb_FULLDEPS),$(true))
 
@@ -85,10 +83,10 @@ endif
 
 # UnoApiTarget
 
-gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,regcompare)
-gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge)
-gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPAREDEPS := $(call gb_Executable_get_runtime_dependencies,regcompare)
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regcompare)
+gb_UnoApiTarget_REGMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,regmerge)
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regmerge)
 
 gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types)
 
@@ -148,7 +146,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
 		$(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \
-	$(call gb_Executable_get_target_for_build,concat-deps) $${RESPONSEFILE} > $(1)) && \
+	$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
 	rm -f $${RESPONSEFILE}
 
 endef
@@ -185,7 +183,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
 	$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
 $(call gb_UnoApiTarget__add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd))
 $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) \
-	: $(gb_UnoApiPartTarget_IDLCTARGET) \
+	: $(gb_UnoApiPartTarget_IDLCDEPS) \
 	| $(call gb_UnoApiPartTarget_get_target,$(2)/.dir)
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -208,7 +206,7 @@ endef
 define gb_UnoApiTarget_add_idlfiles
 $(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
 $(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGEDEPS)
 
 endef
 
@@ -223,7 +221,7 @@ endef
 
 define gb_UnoApiTarget_merge_api
 $(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb)))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGEDEPS)
 
 endef
 
@@ -243,7 +241,7 @@ endef
 
 define gb_UnoApiTarget_set_reference_rdbfile
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGCOMPARETARGET)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGCOMPAREDEPS)
 
 endef
 
@@ -298,8 +296,8 @@ ifeq ($(origin gb_UnoApiHeadersTarget_select_variant),undefined)
 $(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be defined by platform))
 endif
 
-gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker)
-gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+gb_UnoApiHeadersTarget_CPPUMAKERDEPS := $(call gb_Executable_get_runtime_dependencies,cppumaker)
+gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,cppumaker)
 
 define gb_UnoApiHeadersTarget__command
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
@@ -314,17 +312,17 @@ define gb_UnoApiHeadersTarget__command
 endef
 
 $(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,%) : \
-		$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+		$(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
 	$(call gb_Output_announce,$*,$(true),HPB,3) \
 	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*))
 
 $(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,%) : \
-		$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+		$(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
 	$(call gb_Output_announce,$*,$(true),HPC,3)
 	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C)
 
 $(call gb_UnoApiHeadersTarget_get_real_target,%) : \
-		$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+		$(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
 	$(call gb_Output_announce,$*,$(true),HPP,3) \
 	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L)