Mercurial > hg > octave-lyh
changeset 6673:81a24fed2f57
[project @ 2007-05-30 22:52:14 by jwe]
author | jwe |
---|---|
date | Wed, 30 May 2007 22:52:14 +0000 |
parents | 2f0abcba669c |
children | e236f1b0a221 |
files | doc/ChangeLog doc/interpreter/Makefile.in |
diffstat | 2 files changed, 38 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2007-05-30 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.in (TEXI2DVICOMMAND, TEXI2PDFCOMMAND): + New macros. + (octave-a4.pdf, octave-smallbook.pdf): New targets. + (FORMATTED, all): Include octave-a4.pdf in list of dependencies. + Delete octave.dvi and octave.ps from list. + (FORMATTED, all): Use $(PDF_TARGETS). + (maintainer-clean): Depend on clean. + 2007-05-30 G. D. McBain <gdmcbain@freeshell.org> * interpreter/expr.txi (Assignment Ops): Doc fix.
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -81,8 +81,13 @@ TEXINFO := $(TEXINFO_SOURCE) ../conf.texi -FORMATTED = octave.dvi octave.ps octave.pdf \ - octave.info octave.info-[0-9]* +TEXI2DVICOMMAND = TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \ + $(UNSETCOMSPEC) $(TEXI2DVI) $(MAIN_TEXINFO) --output $@ + +TEXI2PDFCOMMAND = TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \ + $(UNSETCOMSPEC) $(TEXI2PDF) $(MAIN_TEXINFO) --output $@ + +FORMATTED = octave.info octave.pdf octave-a4.pdf octave.info-[0-9]* MAN_BASE := mkoctfile octave octave-bug octave-config MAN_SRC := $(addsuffix .1, $(MAN_BASE)) @@ -109,7 +114,7 @@ $(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp mv $@.tmp $@ -all: octave.info octave.dvi octave.ps octave.pdf HTML/index.html +all: octave.info octave.pdf octave-a4.pdf HTML/index.html .PHONY: all $(TEXINFO): src-DOCSTRINGS scripts-DOCSTRINGS munge-texi$(BUILD_EXEEXT) @@ -143,12 +148,29 @@ -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \ $(UNSETCOMSPEC) $(TEXI2DVI) $(MAIN_TEXINFO) +octave-a4.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES) + -$(TEXI2DVICOMMAND) -t @afourpaper + +octave-smallbook.dvi: $(IMAGES_EPS) $(TEXINFO) $(EXAMPLE_FILES) + -$(TEXI2DVICOMMAND) -t @smallbook + octave.ps: octave.dvi -dvips -o $@ $< +octave-a4.ps: octave-a4.dvi + -dvips -o $@ $< + +octave-smallbook.ps: octave-smallbook.dvi + -dvips -o $@ $< + octave.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES) - -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" \ - $(UNSETCOMSPEC) $(TEXI2PDF) $(MAIN_TEXINFO) + -$(TEXI2PDFCOMMAND) + +octave-a4.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES) + -$(TEXI2PDFCOMMAND) -t @afourpaper + +octave-smallbook.pdf: $(IMAGES_PDF) $(TEXINFO) $(EXAMPLE_FILES) + -$(TEXI2PDFCOMMAND) -t @smallbook ../../INSTALL.OCTAVE: install.texi rm -f INSTALL @@ -266,7 +288,7 @@ rm -f Makefile .PHONY: distclean -maintainer-clean: clean-texi +maintainer-clean: clean clean-texi rm -f Makefile tags TAGS $(FORMATTED) $(IMAGES) rm -rf HTML .PHONY: maintainer-clean