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 /shell | |
| 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 'shell')
| -rw-r--r-- | shell/CustomTarget_shlxthdl_res.mk | 6 | ||||
| -rw-r--r-- | shell/CustomTarget_spsupp_idl.mk | 2 | ||||
| -rw-r--r-- | shell/CustomTarget_x64.mk | 6 | ||||
| -rw-r--r-- | shell/WinResTarget_spsupp.mk | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk index 2780958cf0e2..26ffb3b4dc73 100644 --- a/shell/CustomTarget_shlxthdl_res.mk +++ b/shell/CustomTarget_shlxthdl_res.mk @@ -14,8 +14,8 @@ $(eval $(call gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/r shlxthdl_impl.rc \ )) -$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : \ - $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \ +$(gb_CustomTarget_workdir)/shell/source/win32/shlxthandler/res/shlxthdl_impl.rc : \ + $(gb_CustomTarget_workdir)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \ $(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \ $(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \ $(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \ @@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),LCX) $(eval $(call gb_CustomTarget_ulfex_rule,\ - $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf,\ + $(gb_CustomTarget_workdir)/shell/source/win32/shlxthandler/res/shlxthdl.ulf,\ $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf,\ $(foreach lang,$(gb_TRANS_LANGS),\ $(gb_POLOCATION)/$(lang)/shell/source/win32/shlxthandler/res.po))) diff --git a/shell/CustomTarget_spsupp_idl.mk b/shell/CustomTarget_spsupp_idl.mk index 2c860f6d81d1..7714c0586b65 100644 --- a/shell/CustomTarget_spsupp_idl.mk +++ b/shell/CustomTarget_spsupp_idl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,shell/source/win32/spsupp/idl)) -spsupp_IDLDIR := $(call gb_CustomTarget_get_workdir,shell/source/win32/spsupp/idl) +spsupp_IDLDIR := $(gb_CustomTarget_workdir)/shell/source/win32/spsupp/idl $(call gb_CustomTarget_get_target,shell/source/win32/spsupp/idl) : \ $(spsupp_IDLDIR)/spsupp.tlb diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk index 79dcde80d0e3..b5aa0397ae4f 100644 --- a/shell/CustomTarget_x64.mk +++ b/shell/CustomTarget_x64.mk @@ -59,11 +59,11 @@ SHELL_HEADERS := \ $(call gb_CustomTarget_get_target,shell/source) : \ $(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) $(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) $(SHELL_XMLPARSER_FILES),\ - $(call gb_CustomTarget_get_workdir,shell/source)/$(source).cxx) \ + $(gb_CustomTarget_workdir)/shell/source/$(source).cxx) \ $(foreach header,$(SHELL_HEADERS),\ - $(call gb_CustomTarget_get_workdir,shell/source)/$(header).hxx) + $(gb_CustomTarget_workdir)/shell/source/$(header).hxx) -$(call gb_CustomTarget_get_workdir,shell/source)/% : $(SRCDIR)/shell/source/% +$(gb_CustomTarget_workdir)/shell/source/% : $(SRCDIR)/shell/source/% mkdir -p $(dir $@) && $(call gb_Deliver_deliver,$<,$@) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/WinResTarget_spsupp.mk b/shell/WinResTarget_spsupp.mk index 77d9a41342a8..f601d3b5a082 100644 --- a/shell/WinResTarget_spsupp.mk +++ b/shell/WinResTarget_spsupp.mk @@ -14,7 +14,7 @@ $(eval $(call gb_WinResTarget_use_custom_headers,spsupp,\ )) $(eval $(call gb_WinResTarget_add_defs,spsupp,\ - -DTLB_FILE=\"$(call gb_CustomTarget_get_workdir,shell/source/win32/spsupp/idl)/spsupp.tlb\" \ + -DTLB_FILE=\"$(gb_CustomTarget_workdir)/shell/source/win32/spsupp/idl/spsupp.tlb\" \ )) $(eval $(call gb_WinResTarget_set_rcfile,spsupp,shell/source/win32/spsupp/res/spsupp)) |