# HG changeset patch
# User Mike Miller <address@hidden>
# Date 1346155916 14400
# Node ID 10e348b383d835485145c8087fdbb61b308d58f2
# Parent  b7f9d2c99a06e581e94394f1e243b9544740ba98
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.

diff --git a/doc/interpreter/Makefile.am b/doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am
+++ b/doc/interpreter/Makefile.am
@@ -151,27 +151,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.
@@ -270,7 +267,7 @@
   $(LOGOS) \
   $(TXI_SRC)
 
-DISTCLEANFILES = $(octave_TEXINFOS) doc-cache
+DISTCLEANFILES = $(BUILT_TEXINFOS) doc-cache
 
 MAINTAINERCLEANFILES = $(IMAGES)
 
diff --git a/doc/liboctave/Makefile.am b/doc/liboctave/Makefile.am
--- 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