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 /wizards | |
| 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 'wizards')
| -rw-r--r-- | wizards/CustomTarget_share.mk | 8 | ||||
| -rw-r--r-- | wizards/CustomTarget_wizards.mk | 2 | ||||
| -rw-r--r-- | wizards/Package_share.mk | 2 | ||||
| -rw-r--r-- | wizards/Package_wizards_properties.mk | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/wizards/CustomTarget_share.mk b/wizards/CustomTarget_share.mk index 1c4ce3391167..80dbfa5b039e 100644 --- a/wizards/CustomTarget_share.mk +++ b/wizards/CustomTarget_share.mk @@ -10,12 +10,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,wizards/share)) $(call gb_CustomTarget_get_target,wizards/share): \ - $(call gb_CustomTarget_get_workdir,wizards/share)/dialog.xlc \ - $(call gb_CustomTarget_get_workdir,wizards/share)/script.xlc + $(gb_CustomTarget_workdir)/wizards/share/dialog.xlc \ + $(gb_CustomTarget_workdir)/wizards/share/script.xlc -$(call gb_CustomTarget_get_workdir,wizards/share)/%.xlc: \ +$(gb_CustomTarget_workdir)/wizards/share/%.xlc: \ $(SRCDIR)/wizards/source/configshare/%.xlc \ - | $(call gb_CustomTarget_get_workdir,wizards/share)/.dir + | $(gb_CustomTarget_workdir)/wizards/share/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) sed -e 's/@LIBO_SHARE_FOLDER@/$(LIBO_SHARE_FOLDER)/' $< > $@ diff --git a/wizards/CustomTarget_wizards.mk b/wizards/CustomTarget_wizards.mk index f8d88b4283de..6b18ae11db69 100644 --- a/wizards/CustomTarget_wizards.mk +++ b/wizards/CustomTarget_wizards.mk @@ -9,7 +9,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,wizards/locproperties)) -wizards_DIR := $(call gb_CustomTarget_get_workdir,wizards/locproperties) +wizards_DIR := $(gb_CustomTarget_workdir)/wizards/locproperties define wizards_Properties_Properties $(call wizards_Properties__Properties_impl,$(wizards_DIR)/resources_$(1).properties,$(SRCDIR)/wizards/source/resources/resources_en_US.properties,$(gb_POLOCATION)/$(2)/wizards/source/resources.po,$(2)) diff --git a/wizards/Package_share.mk b/wizards/Package_share.mk index b986041e04ea..a502a52cd4c2 100644 --- a/wizards/Package_share.mk +++ b/wizards/Package_share.mk @@ -17,7 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_Package_Package,wizards_basicshare,$(call gb_CustomTarget_get_workdir,wizards/share))) +$(eval $(call gb_Package_Package,wizards_basicshare,$(gb_CustomTarget_workdir)/wizards/share)) $(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\ dialog.xlc \ diff --git a/wizards/Package_wizards_properties.mk b/wizards/Package_wizards_properties.mk index d687f2cfc7d1..0754aec4b836 100644 --- a/wizards/Package_wizards_properties.mk +++ b/wizards/Package_wizards_properties.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,wizards_properties,$(call gb_CustomTarget_get_workdir,wizards/locproperties))) +$(eval $(call gb_Package_Package,wizards_properties,$(gb_CustomTarget_workdir)/wizards/locproperties)) $(eval $(call gb_Package_add_files,wizards_properties,$(LIBO_SHARE_FOLDER)/wizards,\ $(foreach lang,$(subst -,_,$(wizards_LANGS)),resources_$(lang).properties) \ |