Mercurial > hg > octave-avbm
changeset 9889:81c5ea6ddf81
doc/interpreter build fixes
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 30 Nov 2009 13:25:02 -0500 |
parents | cee6c63cff32 |
children | 483c4b09b788 |
files | doc/ChangeLog doc/interpreter/Makefile.am |
diffstat | 2 files changed, 23 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,14 @@ +2009-11-30 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.a (nodist_octave_TEXINFOS): Add + contributors.texi and $(MUNGED_TEXI_SRC) to the list. + (dist_octave_TEXINFOS): Delete. + (DISTCLEANFILES, all_octave_TEXINFOS): New variables. + ($(srcdir)/octave.info, octave.dvi, octave.pdf, octave.html): + Depend on $(all_octave_TEXINFOS), not $(octave_TEXINFOS). + (octave.ps): Depend on .dvi file and EPS files, but not .texi + source files. + 2009-11-27 David Bateman <dbateman@free.fr> * doc/interpreter/contributors.in: Add Kacper Kowalik.
--- a/doc/interpreter/Makefile.am +++ b/doc/interpreter/Makefile.am @@ -134,25 +134,28 @@ var.texi info_TEXINFOS = octave.texi -nodist_octave_TEXINFOS = \ - ../conf.texi +nodist_octave_TEXINFOS = ../conf.texi contributors.texi $(MUNGED_TEXI_SRC) -dist_octave_TEXINFOS = \ - contributors.texi \ - $(MUNGED_TEXI_SRC) +all_octave_TEXINFOS = \ + $(info_TEXINFOS) \ + $(nodist_octave_TEXINFOS) TXI_SRC = $(MUNGED_TEXI_SRC:.texi=.txi) +DISTCLEANFILES = $(MUNGED_TEXI_SRC) + ../conf.texi: $(MAKE) -C .. conf.texi -$(srcdir)/octave.info: $(octave_TEXINFOS) $(IMAGES_TXT) $(EXAMPLE_FILES) +$(srcdir)/octave.info: $(all_octave_TEXINFOS) $(IMAGES_TXT) $(EXAMPLE_FILES) -octave.dvi octave.ps: $(octave_TEXINFOS) $(IMAGES_EPS) $(EXAMPLE_FILES) +octave.dvi: $(all_octave_TEXINFOS) $(IMAGES_EPS) $(EXAMPLE_FILES) -octave.pdf: $(octave_TEXINFOS) $(IMAGES_PDF) $(EXAMPLE_FILES) +octave.ps: octave.dvi $(IMAGES_EPS) -octave.html: $(octave_TEXINFOS) $(IMAGES_PNG) $(EXAMPLE_FILES) +octave.pdf: $(all_octave_TEXINFOS) $(IMAGES_PDF) $(EXAMPLE_FILES) + +octave.html: $(all_octave_TEXINFOS) $(IMAGES_PNG) $(EXAMPLE_FILES) all-local: dvi html pdf ps doc-cache