diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-04 14:17:41 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-04 16:27:56 +0200 |
| commit | c8a145afbff81d4c19c2346870eb005c775862b1 (patch) | |
| tree | c07fc27e19b1be29263ad36b05b74f1ff8e93ec7 /solenv | |
| parent | ee5eb3dac8c90a49de88475cf2d0de9d8a93e912 (diff) | |
makefile simplification: replace $(call gb_HelpTarget_get_workdir,foo)
…by a simple/static $(gb_HelpTarget_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: Ibe4ce564b021158f3b1800fad96bdeee88792a97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167121
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/HelpTarget.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 98baa661e908..aa114d373b0b 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -377,7 +377,7 @@ endef # gb_HelpLinkTarget_set_indexed target indexfiles define gb_HelpLinkTarget_set_indexed $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(2) -$(addprefix $(call gb_HelpTarget_get_workdir,$(1))/,$(2)) : $(call gb_HelpIndexTarget_get_target,$(1)) +$(addprefix $(gb_HelpTarget_workdir)/$(1)/,$(2)) : $(call gb_HelpIndexTarget_get_target,$(1)) endef @@ -407,7 +407,7 @@ endef define gb_HelpLinkTarget_add_renamed_file $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES += $(strip $(2)),$(strip $(3)) $(call gb_HelpLinkTarget_get_target,$(1)) : $(3) -$(call gb_HelpTarget_get_workdir,$(1))/$(2) : $(call gb_HelpLinkTarget_get_target,$(1)) +$(gb_HelpTarget_workdir)/$(1)/$(2) : $(call gb_HelpLinkTarget_get_target,$(1)) touch $$@ endef @@ -582,7 +582,7 @@ endif $(call gb_HelpTarget_get_linked_target,$*) \ $(call gb_HelpTarget_get_target,$*) \ $(call gb_HelpTarget_get_translation_target,$*) \ - $(call gb_HelpTarget_get_workdir,$*) \ + $(gb_HelpTarget_workdir)/$* \ ) gb_HelpTarget_get_packagename = HelpTarget/$(1) @@ -599,7 +599,7 @@ $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3) $(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES := $(call gb_HelpTarget_get_translation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) -$(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(call gb_HelpTarget_get_workdir,$(1)),$(call gb_HelpTarget_get_packagename,$(1))) +$(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(gb_HelpTarget_workdir)/$(1),$(call gb_HelpTarget_get_packagename,$(1))) endef @@ -617,7 +617,7 @@ endif $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_get_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) -$(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir +$(call gb_HelpLinkTarget_get_target,$(1)) :| $(gb_HelpTarget_workdir)/$(1)/.dir $(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) $(call gb_Package_get_preparation_target,$(5)) : $(call gb_HelpTarget_get_target,$(1)) endif diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 553c127a1781..f59b3da126f9 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -94,7 +94,8 @@ gb_HelpTarget_get_filelist = $(WORKDIR)/HelpTarget/$(1).filelist gb_HelpTarget_get_linked_target = $(WORKDIR)/HelpTarget/$(1).translate gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1)) -gb_HelpTarget_get_workdir = $(WORKDIR)/HelpTarget/$(1) +gb_HelpTarget_get_workdir = $(error please use plain gb_HelpTarget_workdir) +gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget gb_HelpTranslatePartTarget_get_target = $(WORKDIR)/HelpTranslatePartTarget/$(1)/done gb_HelpTranslatePartTarget_get_translated_target = $(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp gb_HelpTranslatePartTarget_get_workdir = $(WORKDIR)/HelpTranslatePartTarget/$(1) |