diff options
| author | Christian Lohmaier <cloph@documentfoundation.org> | 2022-12-09 21:15:52 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-13 15:11:32 +0000 |
| commit | 5b99afe8ba3afe1a4673f8b7628011ced5583570 (patch) | |
| tree | 8dcdc259f8bcd721cf56109ea8afaa927add00e4 /CustomTarget_imagelist.mk | |
| parent | e1cf5179765728ac70b100352ffb09bc1ec3fde5 (diff) | |
avoid needless rebuilds of helpimages
also the create_ilist.pl doesn't really do much anymore, was easily
replaced by a plain $(file …) call
Change-Id: I63a41ef8ed289feb4ab210961d2200032adaac28
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143936
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'CustomTarget_imagelist.mk')
| -rw-r--r-- | CustomTarget_imagelist.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk index c4769b3cd5..d325a46659 100644 --- a/CustomTarget_imagelist.mk +++ b/CustomTarget_imagelist.mk @@ -29,15 +29,13 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ rm -rf $${ILSTFILE}) -# helpimg.ilst is phony to rebuild everything each time -.PHONY : $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst +# include everything including directories to also rebuild on file deletion +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 : \ - $(SRCDIR)/helpcontent2/helpers/create_ilst.pl - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) - $(call gb_Helper_abbreviate_dirs,\ - $(PERL) $< -dir=$(helpmedia_DIR)/media/helpimg -pre=media/helpimg > $@.out && \ - mv $@.out $@ \ - ) +$(call gb_CustomTarget_get_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))))) # vim: set noet sw=4 ts=4: |