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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/CustomTarget_automationtest.mk | 2 | ||||
| -rw-r--r-- | extensions/CustomTarget_so_activex_idl.mk | 2 | ||||
| -rw-r--r-- | extensions/CustomTarget_so_activex_x64.mk | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/extensions/CustomTarget_automationtest.mk b/extensions/CustomTarget_automationtest.mk index e895c0b2a337..b6de71b74211 100644 --- a/extensions/CustomTarget_automationtest.mk +++ b/extensions/CustomTarget_automationtest.mk @@ -9,7 +9,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,extensions/automationtest)) -extensions_AUTOMATIONTESTDIR := $(call gb_CustomTarget_get_workdir,extensions/automationtest) +extensions_AUTOMATIONTESTDIR := $(gb_CustomTarget_workdir)/extensions/automationtest extensions_AUTOMATIONTESTLOG1 := $(extensions_AUTOMATIONTESTDIR)/automationtest.1.log extensions_AUTOMATIONTESTLOG2 := $(extensions_AUTOMATIONTESTDIR)/automationtest.2.log diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk index b4d841aec524..d25e547e1690 100644 --- a/extensions/CustomTarget_so_activex_idl.mk +++ b/extensions/CustomTarget_so_activex_idl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl)) -extensions_AXIDLDIR := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl) +extensions_AXIDLDIR := $(gb_CustomTarget_workdir)/extensions/source/activex/idl $(call gb_CustomTarget_get_target,extensions/source/activex/idl) : \ $(extensions_AXIDLDIR)/so_activex.tlb diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk index 6b1b35d94bb7..a91a114b52ff 100644 --- a/extensions/CustomTarget_so_activex_x64.mk +++ b/extensions/CustomTarget_so_activex_x64.mk @@ -10,16 +10,16 @@ $(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex)) $(call gb_CustomTarget_get_target,extensions/source/activex) : \ - $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActionsApproval.cxx \ - $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActiveX.cxx \ - $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOComWindowPeer.cxx \ - $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SODispatchInterceptor.cxx \ - $(call gb_CustomTarget_get_workdir,extensions/source/activex)/StdAfx2.cxx \ - $(call gb_CustomTarget_get_workdir,extensions/source/activex)/so_activex.cxx \ + $(gb_CustomTarget_workdir)/extensions/source/activex/SOActionsApproval.cxx \ + $(gb_CustomTarget_workdir)/extensions/source/activex/SOActiveX.cxx \ + $(gb_CustomTarget_workdir)/extensions/source/activex/SOComWindowPeer.cxx \ + $(gb_CustomTarget_workdir)/extensions/source/activex/SODispatchInterceptor.cxx \ + $(gb_CustomTarget_workdir)/extensions/source/activex/StdAfx2.cxx \ + $(gb_CustomTarget_workdir)/extensions/source/activex/so_activex.cxx \ -$(call gb_CustomTarget_get_workdir,extensions/source/activex)/% : \ +$(gb_CustomTarget_workdir)/extensions/source/activex/% : \ $(SRCDIR)/extensions/source/activex/% \ - | $(call gb_CustomTarget_get_workdir,extensions/source/activex)/.dir + | $(gb_CustomTarget_workdir)/extensions/source/activex/.dir cp $< $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: |