diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-01-23 00:04:34 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-01-23 00:04:34 +0000 |
commit | e2a5ab71692a77805b927b1fcaa319704c0bb55b (patch) | |
tree | 813642091067afff9b42b924e84b6d06c903e7e0 | |
parent | 2003-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-e2a5ab71692a77805b927b1fcaa319704c0bb55b.tar.bz2 |
2003-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* project.am, main.am: Use automake rules to build ps, pdf, info.
Various minor changes.
-rw-r--r-- | doc/ChangeLog | 5 | ||||
-rw-r--r-- | doc/main.am | 4 | ||||
-rw-r--r-- | doc/project.am | 27 |
3 files changed, 13 insertions, 23 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 466e4363fc..29ce33f4d7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2003-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * project.am, main.am: Use automake rules to build ps, pdf, info. + Various minor changes. + +2003-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * project.am: Append $($(PROJECT)_TEXINFOS) to html-dependencies. diff --git a/doc/main.am b/doc/main.am index b9b6d85aa7..24ad285c11 100644 --- a/doc/main.am +++ b/doc/main.am @@ -1,4 +1,6 @@ -AM_MAKEINFOFLAGS = -I .. -I $(top_srcdir) +AM_MAKEINFOFLAGS = -I $(top_builddir) -I $(top_srcdir) +TEXI2DVI = @TEXI2DVI@ -I $(top_builddir) -I $(top_srcdir) +TEXI2PDF = @TEXI2PDF@ -I $(top_builddir) -I $(top_srcdir) html_projectdir = $(htmldir)/$(PROJECT) diff --git a/doc/project.am b/doc/project.am index 9eb717a290..6f27b375ff 100644 --- a/doc/project.am +++ b/doc/project.am @@ -1,13 +1,13 @@ ## $Id$ +LANG=C SUFFIXES = .t MAINTAINERCLEANFILES = -MOSTLYCLEANFILES = CLEANFILES = - -MAINTAINERCLEANFILES += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9] -MAINTAINERCLEANFILES += $(GENERATED_FILES) +MOSTLYCLEANFILES = +CLEANFILES += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9] +CLEANFILES += $(GENERATED_FILES) ## DVI support dvidir = $(pkgdocdir)/dvi @@ -16,12 +16,8 @@ dvidir = $(pkgdocdir)/dvi psdir = $(pkgdocdir)/ps ## PDF support -SUFFIXES += .pdf - pdfdir = $(pkgdocdir)/pdf -SUFFIXES += .eps - if EPSTOPDF .eps.pdf: $(EPSTOPDF) $< --outfile=$@ @@ -58,26 +54,13 @@ endif if USE_DVI dvi_DATA = $(PROJECT).dvi - -.texi.dvi: - $(TEXI2DVI) -q -I $(srcdir) -I $(top_srcdir) $< +endif # USE_DVI if USE_PS ps_DATA = $(PROJECT).ps -.dvi.ps: - TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \ - $(DVIPS) $< -o $@ endif # USE_PS -endif # USE_DVI if USE_PDF pdf_DATA = $(PROJECT).pdf - -if TEXI2PDF -.texi.pdf: - rm -f *.aux *.cp *.fn *.ky *.pg *.tp *.toc *.vr - $(TEXI2PDF) -q -I $(srcdir) -I $(top_srcdir) $< -endif - endif |