--- a/Makefile	Fri Nov 06 17:10:27 2009 -0500
+++ b/Makefile	Mon Nov 09 11:09:50 2009 -0500
@@ -25,6 +25,7 @@
 	make -f Makefile.coq clean
 	rm -f Makefile.coq .depend $(GLOBALS) cpdt.tgz \
 		latex/*.sty latex/cpdt.* templates/*.v
+	rm -f *.aux *.dvi *.log
 
 doc: latex/cpdt.dvi latex/cpdt.pdf html
 
@@ -36,11 +37,14 @@
 		-p "\iffalse" \
 		-o ../latex/cpdt.tex
 
-latex/cpdt.dvi: latex/cpdt.tex
-	cd latex ; latex cpdt ; latex cpdt
+latex/%.tex: src/%.v
+	coqdoc --interpolate --latex -s $< -o $@
 
-latex/cpdt.pdf: latex/cpdt.dvi
-	cd latex ; pdflatex cpdt
+latex/%.dvi: latex/%.tex
+	latex $< ; latex $<
+
+latex/%.pdf: latex/%.dvi
+	pdflatex $<
 
 html: Makefile $(VS) src/toc.html
 	mkdir -p html