makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)

…by a simple/static $(gb_CustomTarget_workdir)/foo

The build system has a lot of overly complicated leftovers from when it
was introduced and had not only deal with split repositories but also
had to coexist with another buildsystem. Along with lots of copy'n'paste
along the years the makefiles became hard to grasp for newcomers with
all our calls and evals.
As a first step to streamline that, the macros from TargetLocations that
simply prefix a static path to the argument (and similar of the same
kind) are a natural pick before simplifying the rules themselves/getting
rid of a bunch of eval statements.

Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

4 files changed, 6 insertions, 6 deletions

diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk
index 541620304d89..1a34501e59f2 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -20,15 +20,15 @@ else
 pyuno_PYTHON_SHELL_VERSION:=$(PYTHON_VERSION)
 endif
 
-$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : \
+$(gb_CustomTarget_workdir)/pyuno/python_shell/python.sh : \
 		$(SRCDIR)/pyuno/zipcore/python.sh \
-		$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh
+		$(gb_CustomTarget_workdir)/pyuno/python_shell/os.sh
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT)
 	cat $^ > $@ && chmod +x $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT)
 
-$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \
+$(gb_CustomTarget_workdir)/pyuno/python_shell/os.sh : \
 		$(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh \
 		$(BUILDDIR)/config_$(gb_Side)/config_python.h
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
index cc5a67f3cadb..2db26d99f362 100644
--- a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
+++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_register_targets,pyuno/pythonloader_ini, \
     $(call gb_Helper_get_rcfile,pythonloader.uno) \
 ))
 
-$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call gb_Helper_get_rcfile,pythonloader.uno): \
+$(gb_CustomTarget_workdir)/pyuno/pythonloader_ini/$(call gb_Helper_get_rcfile,pythonloader.uno): \
 			$(BUILDDIR)/config_$(gb_Side)/config_python.h \
             $(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index f75cda39af31..0ecc42b886f7 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell)))
+$(eval $(call gb_Package_Package,python_shell,$(gb_CustomTarget_workdir)/pyuno/python_shell))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,python_shell,$(LIBO_ETC_FOLDER)/python,python.sh))
diff --git a/pyuno/Package_pyuno_pythonloader_ini.mk b/pyuno/Package_pyuno_pythonloader_ini.mk
index 0fae14618695..024f3635d89d 100644
--- a/pyuno/Package_pyuno_pythonloader_ini.mk
+++ b/pyuno/Package_pyuno_pythonloader_ini.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,pyuno_pythonloader_ini,$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)))
+$(eval $(call gb_Package_Package,pyuno_pythonloader_ini,$(gb_CustomTarget_workdir)/pyuno/pythonloader_ini))
 
 $(eval $(call gb_Package_add_files,pyuno_pythonloader_ini,$(LIBO_ETC_FOLDER), \
     $(call gb_Helper_get_rcfile,pythonloader.uno) \