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 /officecfg | |
| 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 'officecfg')
| -rw-r--r-- | officecfg/CustomTarget_registry.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index 55548e1ffe89..f1583fb618cf 100644 --- a/officecfg/CustomTarget_registry.mk +++ b/officecfg/CustomTarget_registry.mk @@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry)) $(call gb_CustomTarget_get_target,officecfg/registry) : \ $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),\ - $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/$(i).hxx) + $(gb_CustomTarget_workdir)/officecfg/registry/officecfg/$(i).hxx) # via define so it can end with a newline define officecfg_geninclude @@ -20,7 +20,7 @@ define officecfg_geninclude endef # auto generated header file for unit test qa/cppheader.cxx -$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_allheaders.hxx: \ +$(gb_CustomTarget_workdir)/officecfg/registry/officecfg/officecfg_qa_allheaders.hxx: \ $(SRCDIR)/officecfg/files.mk $(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1) $(call gb_Trace_StartRange,officecfg_qa_allheaders.hxx,CAT) @@ -31,7 +31,7 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_al # pass the stem as space separated path elements and get a set of --stringparam ns<level> <element> in return officecfg_xsltparams=$(if $(filter-out $(lastword $1),$1),$(call officecfg_xsltparams,$(filter-out $(lastword $1),$1))) --stringparam ns$(words $1) $(lastword $1) -$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/%.hxx: \ +$(gb_CustomTarget_workdir)/officecfg/registry/officecfg/%.hxx: \ $(SRCDIR)/officecfg/registry/schema/org/openoffice/%.xcs \ $(SRCDIR)/officecfg/registry/cppheader.xsl\ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) |