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 /readlicense_oo | |
| 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 'readlicense_oo')
| -rw-r--r-- | readlicense_oo/CustomTarget_license.mk | 2 | ||||
| -rw-r--r-- | readlicense_oo/CustomTarget_readme.mk | 2 | ||||
| -rw-r--r-- | readlicense_oo/Package_license.mk | 2 | ||||
| -rw-r--r-- | readlicense_oo/Package_readlicense_oo_readmes.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk index b4baf7a8f026..dedb2ccb3f37 100644 --- a/readlicense_oo/CustomTarget_license.mk +++ b/readlicense_oo/CustomTarget_license.mk @@ -9,7 +9,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,readlicense_oo/license)) -readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license) +readlicense_oo_DIR := $(gb_CustomTarget_workdir)/readlicense_oo/license readlicense_oo_LICENSE_xml := $(SRCDIR)/readlicense_oo/license/license.xml $(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/LICENSE.html diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index bb3b41e768a8..14e6241ed72c 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -9,7 +9,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,readlicense_oo/readme)) -readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme) +readlicense_oo_DIR := $(gb_CustomTarget_workdir)/readlicense_oo/readme # gb_WITH_LANG is empty if --with-lang is not set # what we need here is: gb_WITH_LANG_OR_DEFAULT ;-) diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk index 67755904a007..bd6497b10296 100644 --- a/readlicense_oo/Package_license.mk +++ b/readlicense_oo/Package_license.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license))) +$(eval $(call gb_Package_Package,readlicense_oo_license,$(gb_CustomTarget_workdir)/readlicense_oo/license)) ifeq ($(OS),WNT) $(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt)) diff --git a/readlicense_oo/Package_readlicense_oo_readmes.mk b/readlicense_oo/Package_readlicense_oo_readmes.mk index bce3c0c6295d..07786d728416 100644 --- a/readlicense_oo/Package_readlicense_oo_readmes.mk +++ b/readlicense_oo/Package_readlicense_oo_readmes.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,readlicense_oo_readmes,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme))) +$(eval $(call gb_Package_Package,readlicense_oo_readmes,$(gb_CustomTarget_workdir)/readlicense_oo/readme)) $(eval $(call gb_Package_add_files,readlicense_oo_readmes,$(LIBO_SHARE_READMES_FOLDER), \ $(foreach lang,$(readlicense_oo_LANGS),$(call gb_README,$(lang))) \ |