Mercurial > hg > octave-lyh

changeset 15248:969952fcd30f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Fix and combine dependencies of documentation * doc/interpreter/Makefile.am: Combine dependencies into octave_TEXINFOS. Remove unnecessary dependency on version.texi. * doc/liboctave/Makefile.am: Remove unnecessary dependency on version.texi.
author Mike Miller <mtmiller@ieee.org>
date Tue, 28 Aug 2012 21:26:04 -0400
parents e787ba62aacf
children 7880fa9d676f
files doc/interpreter/Makefile.am doc/liboctave/Makefile.am
diffstat 2 files changed, 10 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/Makefile.am
+++ b/doc/interpreter/Makefile.am
@@ -147,27 +147,24 @@
   var.texi \
   vectorize.texi
 
+BUILT_TEXINFOS = \
+  contributors.texi \
+  $(MUNGED_TEXI_SRC)
+
 TXI_SRC = $(MUNGED_TEXI_SRC:.texi=.txi)
 
 info_TEXINFOS = octave.texi
 
 octave_TEXINFOS = \
-  contributors.texi \
-  $(MUNGED_TEXI_SRC)
-
-octave.info octave.dvi octave.html/index.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES) $(srcdir)/images.mk
-
-octave.info: $(IMAGES_TXT)
-
-octave.dvi octave.ps: $(IMAGES_EPS) octave_logo.eps
-
-octave.html/index.html: $(IMAGES_PNG)
+  $(BUILT_TEXINFOS) \
+  $(EXAMPLE_FILES) \
+  $(IMAGES) \
+  $(LOGOS) \
+  $(srcdir)/images.mk
 
 octave.html:
 	if [ -d octave.html ]; then true; else mkdir octave.html; fi
 
-octave.pdf: $(IMAGES_PDF) octave_logo.pdf
-
 ## The texi2dvi script (used to create both PDF and DVI output formats)
 ## uses some fixed temporary file names, so wait for DVI file to be
 ## generated before creating PDF file to avoid conflicts.
@@ -266,7 +263,7 @@
   $(LOGOS) \
   $(TXI_SRC)
 
-DISTCLEANFILES = $(octave_TEXINFOS) doc-cache
+DISTCLEANFILES = $(BUILT_TEXINFOS) doc-cache
 
 MAINTAINERCLEANFILES = $(IMAGES)
 
--- a/doc/liboctave/Makefile.am
+++ b/doc/liboctave/Makefile.am
@@ -52,7 +52,5 @@
 
 all-local: dvi html pdf ps
 
-liboctave.info liboctave.dvi liboctave.html liboctave.pdf: $(srcdir)/version.texi
-
 EXTRA_DIST = liboctave.dvi liboctave.html liboctave.pdf liboctave.ps