Commit e4a682bd authored by Adam Chlipala's avatar Adam Chlipala

Merge; make prose nicer

parents 43ca60f6 f5323888
...@@ -4,12 +4,12 @@ syntax: glob ...@@ -4,12 +4,12 @@ syntax: glob
*.depend *.depend
*.vo *.vo
*/Makefile.coq Makefile.coq
*/.coq_globals .coq_globals
*/coqdoc.sty */coqdoc.sty
*/cpdt.* */cpdt.*
*/*.log */*.log
book/html/coqdoc.css html/coqdoc.css
book/html/*.html html/*.html
...@@ -21,7 +21,7 @@ clean:: Makefile.coq ...@@ -21,7 +21,7 @@ clean:: Makefile.coq
rm -f Makefile.coq .depend $(GLOBALS) \ rm -f Makefile.coq .depend $(GLOBALS) \
latex/*.sty latex/cpdt.* latex/*.sty latex/cpdt.*
doc: latex/cpdt.dvi html doc: latex/cpdt.dvi latex/cpdt.pdf html
latex/cpdt.tex: $(VS) latex/cpdt.tex: $(VS)
cd src ; coqdoc --latex $(VS_DOC) \ cd src ; coqdoc --latex $(VS_DOC) \
...@@ -31,6 +31,9 @@ latex/cpdt.tex: $(VS) ...@@ -31,6 +31,9 @@ latex/cpdt.tex: $(VS)
latex/cpdt.dvi: latex/cpdt.tex latex/cpdt.dvi: latex/cpdt.tex
cd latex ; latex cpdt ; latex cpdt cd latex ; latex cpdt ; latex cpdt
latex/cpdt.pdf: latex/cpdt.dvi
cd latex ; pdflatex cpdt
html: $(VS) html: $(VS)
cd src ; coqdoc $(VS_DOC) -toc \ cd src ; coqdoc $(VS_DOC) -toc \
--glob-from ../$(GLOBALS) \ --glob-from ../$(GLOBALS) \
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment