[Sbcl-commits] CVS: sbcl/doc/manual Makefile,1.11,1.12 intro.texinfo,1.9,1.10 sbcl.texinfo,1.14,1.15

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/doc/manual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30210/doc/manual

Modified Files:
	Makefile intro.texinfo sbcl.texinfo 
Log Message:
0.8.13.75: MORE MANUALS
            * Pull asdf.texinfo from upstream; build and install
               it along with the rest of the documentation.


Index: Makefile
===================================================================
RCS file: /cvsroot/sbcl/sbcl/doc/manual/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	17 Aug 2004 17:32:13 -0000	1.11
+++ Makefile	18 Aug 2004 12:42:45 -0000	1.12
@@ -1,13 +1,13 @@
-DOCFILES:=$(shell echo *.texinfo)
-ROOTFILE:=sbcl.texinfo
-TMPFILES:=sbcl.aux sbcl.cp sbcl.fn sbcl.ky sbcl.log sbcl.pg sbcl.toc sbcl.tp sbcl.vr
-
-PSFILE=sbcl.ps
-PDFFILE=sbcl.pdf
-DVIFILE=sbcl.dvi
-INFOFILE=sbcl.info
+SBCLTEXI:=sbcl.texinfo
+ASDFTEXI:=asdf.texinfo
+DOCFILES:=*.texinfo $(ASDFTEXI)
+TMPTYPES:=aux cps fns ky log pg toc tps vrs
+TMPFILES:=$(foreach target,asdf sbcl,$(foreach type,$(TMPTYPES),$(target).$(type)))
+PSFILES=sbcl.ps asdf.ps
+PDFFILES=sbcl.pdf asdf.pdf
+INFOFILES=sbcl.info asdf.info
 VARSFILE=variables.template
-HTMLDIR=$(basename $(ROOTFILE))
+HTMLDIRS=$(basename $(SBCLTEXI)) $(basename $(ASDFTEXI))
 # Place where generated documentation ends up. The value of
 # DOCSTRINGDIR has to end with a slash or you lose (it's passed to
 # Lisp's `pathname' function).
@@ -32,50 +32,52 @@
 endif
 
 .PHONY: all
-all: ps pdf info html
+all: asdf.texinfo ps pdf info html
 
 .PHONY: dist
 dist: html pdf
 
+asdf.texinfo:
+	rm -f asdf.texinfo
+	ln -s ../../contrib/asdf/asdf.texinfo
 
 variables: ${VARSFILE}
 	./extract-values.sh < ${VARSFILE} >variables.texinfo
 
-# html documentation; output in $(HTMLDIR)
+# html documentation; output in $(HTMLDIRS)
 .PHONY: html
 html: html-stamp
 
 html-stamp: variables $(DOCFILES) docstrings
-	@rm -rf $(HTMLDIR)
-	$(MAKEINFO) $(I_FLAGS) --html $(ROOTFILE)
+	@rm -rf $(HTMLDIRS)
+	$(MAKEINFO) $(I_FLAGS) --html $(SBCLTEXI)
+	$(MAKEINFO) --html $(ASDFTEXI)
 	touch html-stamp
 
 # Postscript documentation
 .PHONY: ps
-ps: $(PSFILE)
+ps: $(PSFILES)
 
-$(PSFILE): $(DVIFILE)
+%.ps: %.dvi
 	dvips -o $@ $<
 
-$(DVIFILE): variables $(DOCFILES) docstrings
-	texi2dvi $(I_FLAGS) $(ROOTFILE)
+# DVI generation
+%.dvi: %.texinfo variables $(DOCFILES) docstrings
+	texi2dvi $(I_FLAGS) $<
 
 # PDF documentation
 .PHONY: pdf
-pdf: $(PDFFILE)
+pdf: $(PDFFILES)
 
-$(PDFFILE): variables $(DOCFILES) docstrings
-	texi2pdf $(I_FLAGS) $(ROOTFILE)
+%.pdf: %.texinfo variables $(DOCFILES) docstrings
+	texi2pdf $(I_FLAGS) $<
 
 # info docfiles
 .PHONY: info
-info: $(INFOFILE)
-
-$(INFOFILE): variables $(DOCFILES) docstrings
-	$(MAKEINFO) $(I_FLAGS) $(ROOTFILE)
+info: $(INFOFILES)
 
-# contrib-modules.texinfo includes contrib-doc-list.texi-temp
-contrib-modules.texinfo: tempfiles-stamp
+%.info: %.texinfo variables $(DOCFILES) docstrings
+	$(MAKEINFO) $(I_FLAGS) $<
 
 # Texinfo docstring snippets
 .PHONY: docstrings
@@ -88,11 +90,11 @@
 .PHONY: clean
 clean: 
 	rm -f *~ *.bak *.orig \#*\# .\#* texput.log *.fasl
-	rm -rf $(HTMLDIR) $(DOCSTRINGDIR)
+	rm -rf $(HTMLDIRS) $(DOCSTRINGDIR)
 	rm -f contrib-docs.texi-temp
 	rm -f package-locks.texi-temp
 	rm -f $(PSFILE) $(PDFFILE) $(DVIFILE) html-stamp tempfiles-stamp
-	rm -f $(TMPFILES) contrib-doc-list.texi-temp
+	rm -f $(TMPFILES)
 	rm -f sbcl.info sbcl.info-*
 
 .PHONY: distclean

Index: intro.texinfo
===================================================================
RCS file: /cvsroot/sbcl/sbcl/doc/manual/intro.texinfo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- intro.texinfo	17 Aug 2004 22:55:57 -0000	1.9
+++ intro.texinfo	18 Aug 2004 12:42:46 -0000	1.10
@@ -50,7 +50,8 @@
 
 @item System Definition Tool
 @code{asdf} is a flexible and popular protocol-oriented system
-definition tool by Daniel Barlow. 
+definition tool by Daniel Barlow. @inforef{Top,the asdf manual,asdf}, for
+more information.
 
 @item Third-party Extension Installation Tool
 @code{asdf-install} is a tool that can be used to download and install

Index: sbcl.texinfo
===================================================================
RCS file: /cvsroot/sbcl/sbcl/doc/manual/sbcl.texinfo,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sbcl.texinfo	17 Aug 2004 22:55:57 -0000	1.14
+++ sbcl.texinfo	18 Aug 2004 12:42:46 -0000	1.15
@@ -4,7 +4,6 @@
 @settitle SBCL User Manual
 @c %**end of header
 
-
 @include variables.texinfo
 @set EDITION 0.1
 @settitle SBCL @value{VERSION} User Manual 
@@ -16,7 +15,6 @@
 @end direntry
 
 @copying
-
 @quotation
 This manual is part of the SBCL software system. See the
 @file{README} file for more information.
@@ -27,7 +25,6 @@
 provided with absolutely no warranty. See the @file{COPYING} and
 @file{CREDITS} files for more information.
 @end quotation
-
 @end copying
 
 @titlepage
@@ -37,7 +34,6 @@
 @subtitle @value{UPDATE-MONTH}
 @c @author The CMUCL and SBCL teams
 
-
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll