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>

5 files changed, 16 insertions, 16 deletions

diff --git a/static/CustomTarget_components.mk b/static/CustomTarget_components.mk
index 510395c9488b..cc5a604d3bf0 100644
--- a/static/CustomTarget_components.mk
+++ b/static/CustomTarget_components.mk
@@ -10,8 +10,8 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,static/components))
 
-static_WORKDIR := $(call gb_CustomTarget_get_workdir,static)
-postprocess_WORKDIR := $(call gb_CustomTarget_get_workdir,postprocess)
+static_WORKDIR := $(gb_CustomTarget_workdir)/static
+postprocess_WORKDIR := $(gb_CustomTarget_workdir)/postprocess
 
 $(call gb_CustomTarget_get_target,static/components): \
     $(static_WORKDIR)/component_maps.cxx \
diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk
index 89b0c628b4c8..b82dcff82aa7 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -1487,7 +1487,7 @@ gb_emscripten_fs_image_filelists += $(call gb_Package_get_target,fontconfig_data
 # Ruleset
 #
 
-emscripten_fs_image_WORKDIR := $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)
+emscripten_fs_image_WORKDIR := $(gb_CustomTarget_workdir)/static/emscripten_fs_image
 
 # we just need data.js.link at link time, which is equal to soffice.data.js
 $(call gb_CustomTarget_get_target,static/emscripten_fs_image): \
diff --git a/static/CustomTarget_unoembind.mk b/static/CustomTarget_unoembind.mk
index d1bc294e0b9f..dbc06007dfbf 100644
--- a/static/CustomTarget_unoembind.mk
+++ b/static/CustomTarget_unoembind.mk
@@ -14,15 +14,15 @@ $(eval $(call gb_CustomTarget_register_targets,static/unoembind, \
     bindings_uno.js \
 ))
 
-$(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.cxx \
-$(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.hxx \
-$(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js: \
+$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.cxx \
+$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.hxx \
+$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js: \
         $(call gb_Executable_get_target_for_build,embindmaker) $(call gb_UnoApi_get_target,udkapi) \
         $(call gb_UnoApi_get_target,offapi)
 	$(call gb_Executable_get_command,embindmaker) uno \
-        $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.cxx \
-        $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.hxx \
-        $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \
+        $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.cxx \
+        $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.hxx \
+        $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
         +$(call gb_UnoApi_get_target,udkapi) +$(call gb_UnoApi_get_target,offapi)
 
 # vim: set noet sw=4 ts=4:
diff --git a/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
index afd28784eb96..3d43dadb8832 100644
--- a/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
+++ b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
@@ -10,12 +10,12 @@
 $(eval $(call gb_CustomTarget_CustomTarget,static/qt5-mandelbrot))
 
 $(call gb_CustomTarget_get_target,static/qt5-mandelbrot) : \
-	$(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/renderthread.moc \
-	$(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/mandelbrotwidget.moc \
+	$(gb_CustomTarget_workdir)/static/qt5-mandelbrot/renderthread.moc \
+	$(gb_CustomTarget_workdir)/static/qt5-mandelbrot/mandelbrotwidget.moc \
 
-qt5_mandelbrot_MOCDEFS_H := $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/moc_predefs.h
-qt5_mandelbrot_MOCDEFS_CXX := $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/moc_dummy.cxx
-qt5_mandelbrot_WORKDIR :=  $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/.dir
+qt5_mandelbrot_MOCDEFS_H := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/moc_predefs.h
+qt5_mandelbrot_MOCDEFS_CXX := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/moc_dummy.cxx
+qt5_mandelbrot_WORKDIR :=  $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/.dir
 
 $(qt5_mandelbrot_MOCDEFS_CXX): | $(qt5_mandelbrot_WORKDIR)
 	touch $@
@@ -26,7 +26,7 @@ $(qt5_mandelbrot_MOCDEFS_H): $(qt5_mandelbrot_MOCDEFS_CXX) | $(qt5_mandelbrot_WO
 	$(CXX) -pipe -O2 -std=gnu++11 -fno-exceptions $(gb_EMSCRIPTEN_CPPFLAGS) -dM -E -o $@ $<
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CXX)
 
-$(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/%.moc : \
+$(gb_CustomTarget_workdir)/static/qt5-mandelbrot/%.moc : \
 		$(SRCDIR)/static/source/qt5-mandelbrot/%.h \
 		$(qt5_mandelbrot_MOCDEFS_H) | $(qt5_mandelbrot_WORKDIR)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
diff --git a/static/Package_unoembind.mk b/static/Package_unoembind.mk
index d1f82b970424..cfd153e54ade 100644
--- a/static/Package_unoembind.mk
+++ b/static/Package_unoembind.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,unoembind,$(call gb_CustomTarget_get_workdir,static/unoembind)))
+$(eval $(call gb_Package_Package,unoembind,$(gb_CustomTarget_workdir)/static/unoembind))
 
 $(eval $(call gb_Package_use_custom_target,unoembind,static/unoembind))