# HG changeset patch # User John W. Eaton # Date 1259914839 18000 # Node ID 5221eff3ec0254a039fb3235ebc34e0f28be1bd6 # Parent 1020d800d3422084c0c33a709c7cdebbf86702b7 eliminate doc/conf.texi diff -r 1020d800d342 -r 5221eff3ec02 doc/ChangeLog --- a/doc/ChangeLog Fri Dec 04 01:46:34 2009 -0500 +++ b/doc/ChangeLog Fri Dec 04 03:20:39 2009 -0500 @@ -1,3 +1,23 @@ +2009-12-04 John W. Eaton + + * interpreter/octave.texi: Include version.texi instead of conf.texi. + * interpreter/Makefile.am (../conf.texi): Delete rule. + (octave_TEXINFOS): Delete ../conf.texi from the list. + ($(srcdir)/octave.info octave.dvi octave.pdf octave.html): + Remove duplicate $(octave_TEXINFOS) dependency. + Depend on $(srcdir)/version.texi. + + * liboctave/liboctave.texi: Include version.texi instead of conf.texi. + * liboctave/Makefile.am (../conf.texi): Delete rule. + (dist_liboctave_TEXINFOS): Delete ../conf.texi from the list. + (.NOTPARALLEL): Correct spelling of target. + ($(srcdir)/liboctave.info liboctave.dvi liboctave.html liboctave.pdf): + Depend on $(srcdir)/version.texi + + * conf.texi.in: Delete. + * Makefile.am: Delete rules for conf.texi. + (.NOTPARALLEL): New target. + 2009-12-03 John W. Eaton * doc/Makefile.am (MUNGED_TEXI_SRC): Define as explicit list. diff -r 1020d800d342 -r 5221eff3ec02 doc/Makefile.am --- a/doc/Makefile.am Fri Dec 04 01:46:34 2009 -0500 +++ b/doc/Makefile.am Fri Dec 04 03:20:39 2009 -0500 @@ -26,22 +26,13 @@ EXTRA_DIST = \ Makefile.am \ ChangeLog \ - conf.texi.in \ texinfo.tex \ texmf.cnf -DISTCLEANFILES = conf.texi - SUBDIRS = . faq interpreter liboctave refcard -all-local: conf.texi - -conf.texi: conf.texi.in Makefile - @echo "making $@ from $<" - @$(SED) < $< \ - -e "s|%OCTAVE_VERSION%|${version}|" > $@-t - $(simple_move_if_change_rule) - ../BUGS ../INSTALL.OCTAVE: $(MAKE) -C interpreter ../$@ .PHONY: ../BUGS ../INSTALL.OCTAVE + +.NOTPARALLEL: diff -r 1020d800d342 -r 5221eff3ec02 doc/conf.texi.in --- a/doc/conf.texi.in Fri Dec 04 01:46:34 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -@c Copyright (C) 1996, 1997, 2006, 2007 John W. Eaton -@c -@c This file is part of Octave. -@c -@c Octave is free software; you can redistribute it and/or modify it -@c under the terms of the GNU General Public License as published by the -@c Free Software Foundation; either version 3 of the License, or (at -@c your option) any later version. -@c -@c Octave is distributed in the hope that it will be useful, but WITHOUT -@c ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -@c FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -@c for more details. -@c -@c You should have received a copy of the GNU General Public License -@c along with Octave; see the file COPYING. If not, see -@c . - -@set OCTAVE_MANUAL -@set VERSION %OCTAVE_VERSION% diff -r 1020d800d342 -r 5221eff3ec02 doc/interpreter/Makefile.am --- a/doc/interpreter/Makefile.am Fri Dec 04 01:46:34 2009 -0500 +++ b/doc/interpreter/Makefile.am Fri Dec 04 03:20:39 2009 -0500 @@ -139,22 +139,18 @@ info_TEXINFOS = octave.texi octave_TEXINFOS = \ - ../conf.texi \ contributors.texi \ $(MUNGED_TEXI_SRC) -../conf.texi: - $(MAKE) -C .. conf.texi - -$(srcdir)/octave.info octave.dvi octave.pdf octave.html: $(octave_TEXINFOS) $(octave_TEXINFOS) $(EXAMPLE_FILES) +$(srcdir)/octave.info octave.dvi octave.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES) $(srcdir)/octave.info: $(IMAGES_TXT) octave.dvi octave.ps: $(IMAGES_EPS) -octave.pdf: $(IMAGES_PDF) +octave.html: $(IMAGES_PNG) -octave.html: $(IMAGES_PNG) +octave.pdf: $(IMAGES_PDF) all-local: dvi html pdf ps doc-cache @@ -215,4 +211,4 @@ MAINTAINERCLEANFILES = $(IMAGES) -.NOPARALLEL: +.NOTPARALLEL: diff -r 1020d800d342 -r 5221eff3ec02 doc/interpreter/octave.texi --- a/doc/interpreter/octave.texi Fri Dec 04 01:46:34 2009 -0500 +++ b/doc/interpreter/octave.texi Fri Dec 04 03:20:39 2009 -0500 @@ -66,11 +66,10 @@ @defindex op -@c Things like the Octave version number are defined in conf.texi. -@c This file doesn't include a chapter, so it must not be included -@c if you want to run the Emacs function texinfo-multiple-files-update. - -@include conf.texi +@c The version.texi file doesn't include a chapter, so it must not be +@c included if you want to run the Emacs function +@c texinfo-multiple-files-update. +@include version.texi @settitle GNU Octave diff -r 1020d800d342 -r 5221eff3ec02 doc/liboctave/Makefile.am --- a/doc/liboctave/Makefile.am Fri Dec 04 01:46:34 2009 -0500 +++ b/doc/liboctave/Makefile.am Fri Dec 04 03:20:39 2009 -0500 @@ -34,7 +34,6 @@ info_TEXINFOS = liboctave.texi dist_liboctave_TEXINFOS = \ - ../conf.texi \ array.texi \ bugs.texi \ cp-idx.texi \ @@ -55,11 +54,10 @@ quad.texi \ range.texi -../conf.texi: - $(MAKE) -C .. conf.texi - all-local: dvi html pdf ps EXTRA_DIST = liboctave.dvi liboctave.html liboctave.pdf liboctave.ps +$(srcdir)/liboctave.info liboctave.dvi liboctave.html liboctave.pdf: $(srcdir)/version.texi + .NOTPARALLEL: diff -r 1020d800d342 -r 5221eff3ec02 doc/liboctave/liboctave.texi --- a/doc/liboctave/liboctave.texi Fri Dec 04 01:46:34 2009 -0500 +++ b/doc/liboctave/liboctave.texi Fri Dec 04 03:20:39 2009 -0500 @@ -47,11 +47,10 @@ @defindex op -@c Things like the Octave version number are defined in conf.texi. -@c This file doesn't include a chapter, so it must not be included -@c if you want to run the Emacs function texinfo-multiple-files-update. - -@include conf.texi +@c The version.texi file doesn't include a chapter, so it must not be +@c included if you want to run the Emacs function +@c texinfo-multiple-files-update. +@include version.texi @settitle Octave C++ Classes