diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-02 11:19:38 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-03 16:06:14 +0200 |
| commit | 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f (patch) | |
| tree | 7d4be7e8156d2fcdb85fb00bf60f32200054fe24 /desktop/Executable_soffice_bin.mk | |
| parent | d19b79e4b4998eddd1baa1ab6a42c4f557889a60 (diff) | |
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>
Diffstat (limited to 'desktop/Executable_soffice_bin.mk')
| -rw-r--r-- | desktop/Executable_soffice_bin.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index 8ffd04ee1c24..0d3ac520c398 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -28,11 +28,11 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\ )) ifeq ($(OS),EMSCRIPTEN) -$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link +$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link # don't sort; later can override previous settings! $(eval $(call gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/environment.js)) -$(eval $(call gb_Executable_add_prejs,soffice_bin,$(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link)) +$(eval $(call gb_Executable_add_prejs,soffice_bin,$(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link)) ifeq ($(ENABLE_QT5),TRUE) $(eval $(call gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/soffice_args.js)) endif @@ -74,11 +74,11 @@ endif ifneq ($(ENABLE_DBGUTIL),) $(call gb_Executable_get_linktarget_target,soffice_bin): \ - $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \ + $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ $(SRCDIR)/unotest/source/embindtest/embindtest.js $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ - --post-js $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \ + --post-js $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ --post-js $(SRCDIR)/unotest/source/embindtest/embindtest.js \ )) |