diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | doc/ChangeLog | 4 | ||||
-rw-r--r-- | doc/Makefile.am | 51 | ||||
-rw-r--r-- | doc/goops/Makefile.am | 39 | ||||
-rw-r--r-- | doc/goops/goops.texi | 2 | ||||
-rw-r--r-- | doc/r5rs/Makefile.am | 24 | ||||
-rw-r--r-- | doc/ref/Makefile.am | 49 | ||||
-rw-r--r-- | doc/ref/guile.texi | 4 | ||||
-rw-r--r-- | doc/tutorial/Makefile.am | 39 | ||||
-rw-r--r-- | doc/tutorial/guile-tut.texi | 2 |
11 files changed, 171 insertions, 52 deletions
@@ -1,3 +1,8 @@ +2001-08-24 Neil Jerram <neil@ossau.uklinux.net> + + * configure.in (AC_CONFIG_FILES): Add per-manual doc directory + Makefiles. + 2001-08-15 Rob Browning <rlb@defaultvalue.org> * configure.in diff --git a/configure.in b/configure.in index 5f7140345..90401b040 100644 --- a/configure.in +++ b/configure.in @@ -634,6 +634,10 @@ AC_CONFIG_FILES([ qt/time/Makefile guile-config/Makefile doc/Makefile + doc/ref/Makefile + doc/tutorial/Makefile + doc/goops/Makefile + doc/r5rs/Makefile examples/Makefile examples/scripts/Makefile examples/box/Makefile diff --git a/doc/ChangeLog b/doc/ChangeLog index 2f3cd2d11..e5b072ee9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2001-08-24 Neil Jerram <neil@ossau.uklinux.net> + + * Makefile.am: Split documentation into per-manual subdirectories. + 2001-08-22 Mikael Djurfeldt <mdj@linnaeus.mit.edu> * scheme-options.texi (Evaluator trap options): Splitted diff --git a/doc/Makefile.am b/doc/Makefile.am index edd481f66..30fa5521a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,45 +19,13 @@ ## to the Free Software Foundation, Inc., 59 Temple Place, Suite ## 330, Boston, MA 02111-1307 USA -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = gnu + +SUBDIRS = ref tutorial goops r5rs # pending the papers from Robert Merkel # man_MANS = guile.1 -info_TEXINFOS = guile.texi r5rs.texi goops.texi guile-tut.texi - -guile_TEXINFOS = preface.texi intro.texi scheme-intro.texi \ - scheme-ideas.texi scheme-data.texi scheme-procedures.texi \ - scheme-utility.texi scheme-binding.texi scheme-control.texi \ - scheme-io.texi scheme-evaluation.texi scheme-memory.texi \ - scheme-modules.texi scheme-scheduling.texi scheme-options.texi \ - scheme-translation.texi scheme-debug.texi deprecated.texi \ - scheme-reading.texi scheme-indices.texi slib.texi posix.texi \ - expect.texi scsh.texi tcltk.texi scripts.texi gh.texi scm.texi \ - appendices.texi indices.texi script-getopt.texi data-rep.texi \ - extend.texi repl-modules.texi srfi-modules.texi misc-modules.texi \ - AUTHORS - -guile_tut_TEXINFOS = AUTHORS - -goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt AUTHORS - -# Optionally support building an HTML version of the reference manual. - -if HTMLDOC - -htmldir = $(prefix)/html/guile-$(VERSION) - -html_DATA = guile_toc.html $(shell ls guile_*.html 2>/dev/null) guile-tut_toc.html $(shell ls guile-tut_*.html 2>/dev/null) - -guile_toc.html: guile.texi $(guile_TEXINFOS) - $(TEXI2HTML) -split_chapter guile.texi - -guile-tut_toc.html: guile-tut.texi - $(TEXI2HTML) -split_chapter guile-tut.texi - -endif - EXAMPLE_SMOB_FILES = \ ChangeLog Makefile README COPYING image-type.c image-type.h myguile.c @@ -71,18 +39,5 @@ dist-hook: cd example-smob; \ cp $(EXAMPLE_SMOB_FILES) $$dest) -## The following two kluges were added so that CVS checkouts would -## build when not configured with `--enable-maintainer-mode'. They -## were removed again since they relied on internal automake features. - -# This rule overrides automake's rule for version.texi. It causes -# version.texi to be created even in non-maintainer-mode. -#$(srcdir)/version.texi: stamp-vti -# @: - -# And the same for version-tutorial.texi. -#$(srcdir)/version-tutorial.texi: stamp-vti1 -# @: - # pending the papers from Robert Merkel # EXTRA_DIST = guile.1 diff --git a/doc/goops/Makefile.am b/doc/goops/Makefile.am new file mode 100644 index 000000000..8a2661dfd --- /dev/null +++ b/doc/goops/Makefile.am @@ -0,0 +1,39 @@ +## Process this file with Automake to create Makefile.in +## +## Copyright (C) 1998 Free Software Foundation, Inc. +## +## This file is part of GUILE. +## +## GUILE is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as +## published by the Free Software Foundation; either version 2, or +## (at your option) any later version. +## +## GUILE is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public +## License along with GUILE; see the file COPYING. If not, write +## to the Free Software Foundation, Inc., 59 Temple Place, Suite +## 330, Boston, MA 02111-1307 USA + +AUTOMAKE_OPTIONS = gnu + +info_TEXINFOS = goops.texi + +goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt ../AUTHORS + +# Optionally support building an HTML version of the manual. + +if HTMLDOC + +htmldir = $(prefix)/html/guile-$(VERSION) + +html_DATA = goops_toc.html $(shell ls goops_*.html 2>/dev/null) + +goops_toc.html: goops.texi $(goops_TEXINFOS) + $(TEXI2HTML) -split_chapter goops.texi + +endif diff --git a/doc/goops/goops.texi b/doc/goops/goops.texi index ac08a2625..580b120e0 100644 --- a/doc/goops/goops.texi +++ b/doc/goops/goops.texi @@ -40,7 +40,7 @@ are preserved on all copies. @titlepage @title Goops Manual @subtitle For use with GOOPS @value{VERSION} -@include AUTHORS +@include ../AUTHORS @c The following two commands @c start the copyright page. diff --git a/doc/r5rs/Makefile.am b/doc/r5rs/Makefile.am new file mode 100644 index 000000000..231c7bfeb --- /dev/null +++ b/doc/r5rs/Makefile.am @@ -0,0 +1,24 @@ +## Process this file with Automake to create Makefile.in +## +## Copyright (C) 1998 Free Software Foundation, Inc. +## +## This file is part of GUILE. +## +## GUILE is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as +## published by the Free Software Foundation; either version 2, or +## (at your option) any later version. +## +## GUILE is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public +## License along with GUILE; see the file COPYING. If not, write +## to the Free Software Foundation, Inc., 59 Temple Place, Suite +## 330, Boston, MA 02111-1307 USA + +AUTOMAKE_OPTIONS = gnu + +info_TEXINFOS = r5rs.texi diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am new file mode 100644 index 000000000..9f264c31c --- /dev/null +++ b/doc/ref/Makefile.am @@ -0,0 +1,49 @@ +## Process this file with Automake to create Makefile.in +## +## Copyright (C) 1998 Free Software Foundation, Inc. +## +## This file is part of GUILE. +## +## GUILE is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as +## published by the Free Software Foundation; either version 2, or +## (at your option) any later version. +## +## GUILE is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public +## License along with GUILE; see the file COPYING. If not, write +## to the Free Software Foundation, Inc., 59 Temple Place, Suite +## 330, Boston, MA 02111-1307 USA + +AUTOMAKE_OPTIONS = gnu + +info_TEXINFOS = guile.texi + +guile_TEXINFOS = preface.texi intro.texi scheme-intro.texi \ + scheme-ideas.texi scheme-data.texi scheme-procedures.texi \ + scheme-utility.texi scheme-binding.texi scheme-control.texi \ + scheme-io.texi scheme-evaluation.texi scheme-memory.texi \ + scheme-modules.texi scheme-scheduling.texi scheme-options.texi \ + scheme-translation.texi scheme-debug.texi deprecated.texi \ + scheme-reading.texi scheme-indices.texi slib.texi posix.texi \ + expect.texi scsh.texi tcltk.texi scripts.texi gh.texi scm.texi \ + appendices.texi indices.texi script-getopt.texi data-rep.texi \ + extend.texi repl-modules.texi srfi-modules.texi misc-modules.texi \ + ../AUTHORS + +# Optionally support building an HTML version of the reference manual. + +if HTMLDOC + +htmldir = $(prefix)/html/guile-$(VERSION) + +html_DATA = guile_toc.html $(shell ls guile_*.html 2>/dev/null) + +guile_toc.html: guile.texi $(guile_TEXINFOS) + $(TEXI2HTML) -split_chapter guile.texi + +endif diff --git a/doc/ref/guile.texi b/doc/ref/guile.texi index 1ba439931..4ff25876b 100644 --- a/doc/ref/guile.texi +++ b/doc/ref/guile.texi @@ -80,9 +80,9 @@ by the Free Software Foundation. @sp 10 @comment The title is printed in a large font. @title Guile Reference Manual -@subtitle $Id: guile.texi,v 1.1 2001-08-24 09:40:29 ossau Exp $ +@subtitle $Id: guile.texi,v 1.2 2001-08-24 10:16:15 ossau Exp $ @subtitle For use with Guile @value{VERSION} -@include AUTHORS +@include ../AUTHORS @c The following two commands start the copyright page. @page diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am new file mode 100644 index 000000000..7d439137f --- /dev/null +++ b/doc/tutorial/Makefile.am @@ -0,0 +1,39 @@ +## Process this file with Automake to create Makefile.in +## +## Copyright (C) 1998 Free Software Foundation, Inc. +## +## This file is part of GUILE. +## +## GUILE is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as +## published by the Free Software Foundation; either version 2, or +## (at your option) any later version. +## +## GUILE is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public +## License along with GUILE; see the file COPYING. If not, write +## to the Free Software Foundation, Inc., 59 Temple Place, Suite +## 330, Boston, MA 02111-1307 USA + +AUTOMAKE_OPTIONS = gnu + +info_TEXINFOS = guile-tut.texi + +guile_tut_TEXINFOS = ../AUTHORS + +# Optionally support building an HTML version of the reference manual. + +if HTMLDOC + +htmldir = $(prefix)/html/guile-$(VERSION) + +html_DATA = guile-tut_toc.html $(shell ls guile-tut_*.html 2>/dev/null) + +guile-tut_toc.html: guile-tut.texi + $(TEXI2HTML) -split_chapter guile-tut.texi + +endif diff --git a/doc/tutorial/guile-tut.texi b/doc/tutorial/guile-tut.texi index b300e2efa..64a4ce782 100644 --- a/doc/tutorial/guile-tut.texi +++ b/doc/tutorial/guile-tut.texi @@ -27,7 +27,7 @@ @title Guile Tutorial @subtitle For use with Guile @value{VERSION} @subtitle Last updated @value{UPDATED} -@include AUTHORS +@include ../AUTHORS @page @vskip 0pt plus 1filll |