changeset 25314:159b359ccc13 stable

use pattern rule to make Qt help files * doc/interpreter/module.mk: Use pattern rule for Qt help files so GNU Make will correctly build them with one invocation of the given rule.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Apr 2018 05:29:36 -0400
parents ebe32e8062ab
children bb43ec3a304e 60fd2d84c9a0
files doc/interpreter/module.mk
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/module.mk	Thu Apr 26 04:32:32 2018 -0400
+++ b/doc/interpreter/module.mk	Thu Apr 26 05:29:36 2018 -0400
@@ -245,18 +245,16 @@
 
 if AMCOND_BUILD_QT_DOCS
 
-$(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) $(HTMLDIR_CSS) %reldir%/mk-qthelp.pl
+## The Qt help collection generator command produces two output files
+## with the same base name.  Use a pattern rule so that GNU Make will
+## only invoke the rule once to generate both files.
+
+%.qhc %.qch : $(OCTAVE_HTML_STAMP) $(HTMLDIR_CSS) %reldir%/mk-qthelp.pl
 	$(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \
 	$(PERL) $(srcdir)/%reldir%/mk-qthelp.pl octave.html %reldir%/octave_interpreter && \
 	$(QCOLLECTIONGENERATOR) $(QCOLLECTIONGENERATORFLAGS) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \
 	rm -f %reldir%/octave_interpreter.qhcp %reldir%/octave_interpreter.qhp
 
-## The Qt help collection generator command produces two output files
-## with the same base name: the compressed help (qch) file and the help
-## collection (qhc) file.  Declare the qhc file to depend on the
-## associated qch file, so that the files are built serially.
-%reldir%/octave_interpreter.qhc: %reldir%/octave_interpreter.qch
-
 endif
 
 $(srcdir)/%reldir%/octave.info: %reldir%/octave.texi $(srcdir)/%reldir%/version-octave.texi