diff options
| author | Christian Lohmaier <cloph@documentfoundation.org> | 2024-05-02 11:35:10 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-03 16:06:39 +0200 |
| commit | e8b21ab244345cea0a1d0b9190a8729ff3ea47b1 (patch) | |
| tree | a0d8a15385837fe4f0112088a438f77fd0d696c3 /CustomTarget_imagelist.mk | |
| parent | d5d56e1d29b65749978ae5e9801531200477761b (diff) | |
makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)
helpcontent2 portion
Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8636560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167007
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'CustomTarget_imagelist.mk')
| -rw-r--r-- | CustomTarget_imagelist.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk index d325a46659..095642ddf1 100644 --- a/CustomTarget_imagelist.mk +++ b/CustomTarget_imagelist.mk @@ -16,8 +16,8 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\ images_helpimg.zip \ )) -$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip : \ - $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \ +$(gb_CustomTarget_workdir)/helpcontent2/source/auxiliary/images_helpimg.zip : \ + $(gb_CustomTarget_workdir)/helpcontent2/source/auxiliary/helpimg.ilst \ | $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ @@ -34,7 +34,7 @@ helpmedia_allMedia:=$(shell $(FIND) $(helpmedia_DIR)/media/helpimg) # but we're only interested in the png images helpmedia_images = $(filter %.png,$(helpmedia_allMedia)) -$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst: $(helpmedia_allMedia) +$(gb_CustomTarget_workdir)/helpcontent2/source/auxiliary/helpimg.ilst: $(helpmedia_allMedia) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LST,1) $(file >$@,$(subst $(WHITESPACE),$(NEWLINE),$(sort $(subst $(helpmedia_DIR)/,%MODULE%/,$(helpmedia_images))))) |