gbuild: clean up pointless proliferation of PRECOMMANDs, all alike

12 files changed, 7 insertions, 128 deletions

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 5e0f89acdab0..ba714df51efe 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -48,9 +48,8 @@
 # SrsPartMergeTarget class
 
 gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build,transex3)
-# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
-
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
+	$(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
 gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 define gb_SrsPartMergeTarget__command
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 21497f5002fe..c08719dd02b6 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -223,7 +223,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 
 gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
 gb_XcuMergeTarget_CFGEXCOMMAND := \
-	$(gb_CFGEXPRECOMMAND) $(gb_XcuMergeTarget_CFGEXTARGET)
+	$(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET)
 gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 # PRJNAME is computed from the stem (parameter $(2))
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index aecae5ef301a..5b9267f32c6d 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -35,7 +35,7 @@ gb_Extension_LICENSEFILE := LICENSE
 endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
-	$(gb_XRMEXPRECOMMAND) $(gb_Extension_XRMEXTARGET)
+	$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
 gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 # does not contain en-US because it is special cased in gb_Extension_Extension
 gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index f8d7b4c8bec9..d1fa175a4589 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -33,7 +33,8 @@
 # SdiTarget class
 
 gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
-gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
+gb_SdiTarget_SVIDLCOMMAND := \
+	$(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET)
 	$(call gb_Output_announce,$*,$(true),SDI,1)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 4be10a4c65bc..9a4772399733 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -352,7 +352,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_XSLTPROCPRECOMMAND) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 8bf5acc16c09..03f85ec49712 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -60,10 +60,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# Extension
-gb_XRMEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 4cfe2d70a6be..2f954c1042a5 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -401,14 +401,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
@@ -425,11 +417,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
@@ -443,13 +430,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SO
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
-# Extension
-gb_XRMEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8fdaab17a027..616550b69c33 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -494,14 +494,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
@@ -518,11 +510,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
@@ -536,13 +523,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 
-# Extension
-gb_XRMEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index ffd74b07ef50..8d0dcd24dc5b 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -362,14 +362,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
@@ -393,11 +385,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
@@ -411,13 +398,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # Python
 gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
-# Extension
-gb_XRMEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 612041e41708..0cf599154cb3 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -493,14 +493,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
@@ -517,11 +509,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
@@ -535,13 +522,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
-# Extension
-gb_XRMEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 484a1d69949c..c7e825b17469 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -688,16 +688,6 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 endef
 
 
-# SdiTarget class
-
-# svidl.exe is in ${OUTDIR}/bin itself, so nothing special needed to have it find
-# DLLs in the same directory
-gb_SdiTarget_SVIDLPRECOMMAND :=
-
-# SrsPartMergeTarget
-# Ditto for transex3
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND :=
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc.exe
@@ -763,11 +753,6 @@ else
 gb_WinResTarget__command_dep =
 endif
 
-# ComponentTarget
-
-# See comment for svidl.exe
-gb_XSLTPROCPRECOMMAND :=
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
@@ -781,13 +766,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
 gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # Python
 gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
 
-# Extension
-gb_XRMEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 643ef45f00ea..ea3ae756dbb4 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -596,14 +596,6 @@ $(call gb_LinkTarget_set_auxtargets,$(2),\
 
 endef
 
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
@@ -669,10 +661,6 @@ else
 gb_WinResTarget__command_dep =
 endif
 
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
@@ -686,13 +674,7 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDI
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # Python
 gb_PYTHON_PRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
 
-# Extension
-gb_XRMEXPRECOMMAND :=  PATH="$${PATH}:$(OUTDIR)/bin"
-
 # vim: set noet sw=4: