CustomTarget_imagelist.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b726222b3b24c87972e772bb5f20e620784cfae5
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Jun 1 12:23:16 2017 +0200
helpcontent2: fix incremental rebuild of *.ilst files
They only depend on the perl script so won't get rebuild if images are
added or removed in source/media/
Use the same hack as in postprocess, make the targets PHONY so they
always get rebuilt.
Also fix a stray \ that caused the wrong output "[PRL] " to be printed
too early.
Change-Id: I03c8696591cf47395211feaed360fbd5642733a0
diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk
index b616d4de6..605b12aa3 100644
--- a/CustomTarget_imagelist.mk
+++ b/CustomTarget_imagelist.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\
$(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip :
\
$(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \
- $(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst \
+ $(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter
%.ilst,$^)) && \
@@ -30,6 +30,9 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \
rm -rf $${ILSTFILE})
+# helpimg.ilst and screenshotimg.ilst are phony to rebuild everything each time
+.PHONY : $(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst
+.PHONY : $(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst
$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst
: \
$(SRCDIR)/helpcontent2/helpers/create_ilst.pl
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
