X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=doc%2Fmanual%2FMakefile;h=c0c41cde363fbe875e1c06f99b5aafc9688924c8;hb=53f4147704fbe48c03dd73d7b6a9f92c0a066ed8;hp=5251918a566bc54324c7e3af0d7d033af1974f7f;hpb=8a3c76ab9725a199aa06a0abc018e096271a0f75;p=sbcl.git

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 5251918..c0c41cd 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -1,18 +1,17 @@
-
-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
-VARSFILE=variables.template
-HTMLDIR=$(basename $(ROOTFILE))
+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
+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).
 DOCSTRINGDIR="docstrings/"
+I_FLAGS=-I $(DOCSTRINGDIR) -I ../../contrib/
 # List of contrib modules that docstring docs will be created for.
 # FIXME: should check test-passed and not load them.
 MODULES=':sb-md5 :sb-rotate-byte :sb-grovel :sb-sprof :sb-bsd-sockets'
@@ -32,50 +31,49 @@ ifeq ($(DVIPS),)
 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 $(DOCSTRINGDIR) --html $(ROOTFILE)
+html-stamp: $(DOCFILES) docstrings
+	@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 $(DOCSTRINGDIR) $(ROOTFILE)
+# DVI generation
+%.dvi: %.texinfo $(DOCFILES) docstrings
+	texi2dvi $(I_FLAGS) $<
 
 # PDF documentation
 .PHONY: pdf
-pdf: $(PDFFILE)
+pdf: $(PDFFILES)
 
-$(PDFFILE): variables $(DOCFILES) docstrings
-	texi2pdf -I $(DOCSTRINGDIR) $(ROOTFILE)
+%.pdf: %.texinfo $(DOCFILES) docstrings
+	texi2pdf $(I_FLAGS) $<
 
 # info docfiles
 .PHONY: info
-info: $(INFOFILE)
-
-$(INFOFILE): variables $(DOCFILES) docstrings
-	$(MAKEINFO) -I $(DOCSTRINGDIR) $(ROOTFILE)
+info: $(INFOFILES)
 
-# contrib-modules.texinfo includes contrib-doc-list.texi-temp
-contrib-modules.texinfo: tempfiles-stamp
+%.info: %.texinfo $(DOCFILES) docstrings
+	$(MAKEINFO) $(I_FLAGS) $<
 
 # Texinfo docstring snippets
 .PHONY: docstrings
@@ -88,11 +86,11 @@ tempfiles-stamp:
 .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