diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-09-15 21:54:42 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-09-15 21:54:42 +0000 |
| commit | ab0472bdb856303c16f99649c803c8c5111b1c11 (patch) | |
| tree | 49671b887fef302768a3eda091b159f0daf4e2f5 | |
| parent | d2597e2b62bbf6143d7b186c7c8cc597161fac2f (diff) | |
- Tentatively made order-dependency wrt .vo files a full dependency
of the doc (use "make QUICK=1" to shortcut it) otherwise, the
compilation of the doc is re-checked only when the doc files are
removed.
- Fixed a typo in coqdoc.sty and a redundancy in Makefile.common .
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12334 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | Makefile.doc | 8 | ||||
| -rw-r--r-- | tools/coqdoc/coqdoc.sty | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common index 2db8aabc7..7116af96e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -589,7 +589,7 @@ PLUGINSVO:= $(OMEGAVO) $(ROMEGAVO) $(MICROMEGAVO) $(RINGVO) $(FIELDVO) \ $(RTAUTOVO) $(RECDEFVO) $(NEWRINGVO) $(DPVO) $(QUOTEVO) \ $(INTERFACEVO) $(GBVO) -ALLVO:= $(INITVO) $(THEORIESVO) $(PLUGINSVO) +ALLVO:= $(THEORIESVO) $(PLUGINSVO) VFILES:= $(ALLVO:.vo=.v) # convert a (stdlib) filename into a module name: diff --git a/Makefile.doc b/Makefile.doc index d8613471b..3da6e10b8 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -49,7 +49,7 @@ ifdef QUICK %.v.tex: %.tex (cd `dirname $<`; $(COQSRC)/$(COQTEX) $(COQTEXOPTS) `basename $<`) else -%.v.tex: %.tex | $(COQTEX) $(COQTOPEXE) $(PLUGINSVO) $(THEORIESVO) +%.v.tex: %.tex $(COQTEX) $(COQTOPEXE) $(PLUGINSVO) $(THEORIESVO) (cd `dirname $<`; $(COQSRC)/$(COQTEX) $(COQTEXOPTS) `basename $<`) endif @@ -189,11 +189,11 @@ ifdef QUICK doc/stdlib/index-body.html: - rm -rf doc/stdlib/html $(MKDIR) doc/stdlib/html - $(COQDOC) -q -d doc/stdlib/html --multi-index --html -g \ + $(COQDOC) -q -boot -d doc/stdlib/html --multi-index --html -g \ -R theories Coq $(THEORIESVO:.vo=.v) mv doc/stdlib/html/index.html doc/stdlib/index-body.html else -doc/stdlib/index-body.html: | $(COQDOC) $(THEORIESVO) +doc/stdlib/index-body.html: $(COQDOC) $(THEORIESVO) - rm -rf doc/stdlib/html $(MKDIR) doc/stdlib/html $(COQDOC) -q -boot -d doc/stdlib/html --multi-index --html -g \ @@ -216,7 +216,7 @@ doc/stdlib/Library.coqdoc.tex: $(COQDOC) -q -boot --gallina --body-only --latex --stdout \ -R theories Coq $(THEORIESLIGHTVO:.vo=.v) >> $@ else -doc/stdlib/Library.coqdoc.tex: | $(COQDOC) $(THEORIESLIGHTVO) +doc/stdlib/Library.coqdoc.tex: $(COQDOC) $(THEORIESLIGHTVO) $(COQDOC) -q -boot --gallina --body-only --latex --stdout \ -R theories Coq $(THEORIESLIGHTVO:.vo=.v) >> $@ endif diff --git a/tools/coqdoc/coqdoc.sty b/tools/coqdoc/coqdoc.sty index 32e635240..ba1173bee 100644 --- a/tools/coqdoc/coqdoc.sty +++ b/tools/coqdoc/coqdoc.sty @@ -110,7 +110,7 @@ \newcommand{\coqref}[2]{#2} \newcommand{\texorpdfstring}[2]{#1} \newcommand{\identref}[2]{\textsf{#2}} - \newcommand{\coqlibrary}[2]{\cleardoublepage\chapter{#2\coqdoccst{#3}}} + \newcommand{\coqlibrary}[2]{\cleardoublepage\chapter{#1\coqdoccst{#2}}} \fi \usepackage{xr} |