maj

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3831 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 114 insertions, 116 deletions

diff --git a/.depend b/.depend
index fd3dc95f6..8e1ca8eb1 100644
--- a/.depend
+++ b/.depend
@@ -524,12 +524,12 @@ interp/constrintern.cmx: lib/bignat.cmx library/declare.cmx \
     pretyping/retyping.cmx kernel/sign.cmx interp/symbols.cmx \
     interp/syntax_def.cmx kernel/term.cmx pretyping/termops.cmx \
     interp/topconstr.cmx lib/util.cmx interp/constrintern.cmi 
-interp/coqlib.cmo: library/declare.cmi library/libnames.cmi kernel/names.cmi \
-    library/nametab.cmi pretyping/pattern.cmi kernel/term.cmi lib/util.cmi \
-    interp/coqlib.cmi 
-interp/coqlib.cmx: library/declare.cmx library/libnames.cmx kernel/names.cmx \
-    library/nametab.cmx pretyping/pattern.cmx kernel/term.cmx lib/util.cmx \
-    interp/coqlib.cmi 
+interp/coqlib.cmo: library/declare.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi kernel/term.cmi lib/util.cmi interp/coqlib.cmi 
+interp/coqlib.cmx: library/declare.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    pretyping/pattern.cmx kernel/term.cmx lib/util.cmx interp/coqlib.cmi 
 interp/genarg.cmo: pretyping/evd.cmi kernel/names.cmi library/nametab.cmi \
     pretyping/rawterm.cmi kernel/term.cmi interp/topconstr.cmi lib/util.cmi \
     interp/genarg.cmi 
@@ -834,9 +834,9 @@ library/library.cmx: library/declaremods.cmx library/lib.cmx \
     kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
     kernel/safe_typing.cmx library/summary.cmx lib/system.cmx lib/util.cmx \
     library/library.cmi 
-library/nameops.cmo: kernel/names.cmi lib/pp.cmi lib/util.cmi \
+library/nameops.cmo: kernel/names.cmi lib/options.cmi lib/pp.cmi lib/util.cmi \
     library/nameops.cmi 
-library/nameops.cmx: kernel/names.cmx lib/pp.cmx lib/util.cmx \
+library/nameops.cmx: kernel/names.cmx lib/options.cmx lib/pp.cmx lib/util.cmx \
     library/nameops.cmi 
 library/nametab.cmo: kernel/declarations.cmi library/libnames.cmi \
     library/nameops.cmi kernel/names.cmi lib/pp.cmi library/summary.cmi \
@@ -1813,28 +1813,28 @@ tactics/refine.cmx: proofs/clenv.cmx kernel/environ.cmx pretyping/evd.cmx \
     pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
     tactics/refine.cmi 
 tactics/setoid_replace.cmo: tactics/auto.cmi toplevel/command.cmi \
-    interp/constrintern.cmi library/decl_kinds.cmo library/declare.cmi \
-    kernel/entries.cmi kernel/environ.cmi pretyping/evd.cmi \
-    library/global.cmi lib/gmap.cmi library/lib.cmi library/libnames.cmi \
-    library/libobject.cmi library/nameops.cmi kernel/names.cmi \
-    library/nametab.cmi lib/options.cmi lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_type.cmi pretyping/reductionops.cmi kernel/safe_typing.cmi \
-    library/summary.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
-    tactics/tactics.cmi kernel/term.cmi parsing/termast.cmi \
-    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
-    toplevel/vernacentries.cmi toplevel/vernacexpr.cmo \
+    interp/constrintern.cmi interp/coqlib.cmi library/decl_kinds.cmo \
+    library/declare.cmi kernel/entries.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi lib/gmap.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
+    kernel/safe_typing.cmi library/summary.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    parsing/termast.cmi pretyping/termops.cmi pretyping/typing.cmi \
+    lib/util.cmi toplevel/vernacentries.cmi toplevel/vernacexpr.cmo \
     toplevel/vernacinterp.cmi tactics/setoid_replace.cmi 
 tactics/setoid_replace.cmx: tactics/auto.cmx toplevel/command.cmx \
-    interp/constrintern.cmx library/decl_kinds.cmx library/declare.cmx \
-    kernel/entries.cmx kernel/environ.cmx pretyping/evd.cmx \
-    library/global.cmx lib/gmap.cmx library/lib.cmx library/libnames.cmx \
-    library/libobject.cmx library/nameops.cmx kernel/names.cmx \
-    library/nametab.cmx lib/options.cmx lib/pp.cmx parsing/printer.cmx \
-    proofs/proof_type.cmx pretyping/reductionops.cmx kernel/safe_typing.cmx \
-    library/summary.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
-    tactics/tactics.cmx kernel/term.cmx parsing/termast.cmx \
-    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
-    toplevel/vernacentries.cmx toplevel/vernacexpr.cmx \
+    interp/constrintern.cmx interp/coqlib.cmx library/decl_kinds.cmx \
+    library/declare.cmx kernel/entries.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx lib/gmap.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
+    parsing/printer.cmx proofs/proof_type.cmx pretyping/reductionops.cmx \
+    kernel/safe_typing.cmx library/summary.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    parsing/termast.cmx pretyping/termops.cmx pretyping/typing.cmx \
+    lib/util.cmx toplevel/vernacentries.cmx toplevel/vernacexpr.cmx \
     toplevel/vernacinterp.cmx tactics/setoid_replace.cmi 
 tactics/tacinterp.cmo: parsing/ast.cmi tactics/auto.cmi kernel/closure.cmi \
     interp/constrintern.cmi parsing/coqast.cmi library/decl_kinds.cmo \
@@ -2244,21 +2244,25 @@ translate/pptacticnew.cmx: kernel/closure.cmx lib/dyn.cmx kernel/environ.cmx \
     interp/ppextend.cmx parsing/pptactic.cmx pretyping/rawterm.cmx \
     proofs/tacexpr.cmx pretyping/termops.cmx interp/topconstr.cmx \
     lib/util.cmx translate/pptacticnew.cmi 
-translate/ppvernacnew.cmo: parsing/ast.cmi parsing/coqast.cmi \
-    library/decl_kinds.cmo parsing/egrammar.cmi parsing/extend.cmi \
+translate/ppvernacnew.cmo: parsing/ast.cmi interp/constrextern.cmi \
+    interp/constrintern.cmi parsing/coqast.cmi library/decl_kinds.cmo \
+    parsing/egrammar.cmi pretyping/evd.cmi parsing/extend.cmi \
     interp/genarg.cmi library/global.cmi library/goptions.cmi \
     library/libnames.cmi library/nameops.cmi kernel/names.cmi \
-    library/nametab.cmi parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmi \
-    translate/ppconstrnew.cmi interp/ppextend.cmi translate/pptacticnew.cmi \
-    pretyping/rawterm.cmi proofs/tacexpr.cmo interp/topconstr.cmi \
+    library/nametab.cmi lib/options.cmi parsing/pcoq.cmi proofs/pfedit.cmi \
+    lib/pp.cmi translate/ppconstrnew.cmi interp/ppextend.cmi \
+    translate/pptacticnew.cmi pretyping/rawterm.cmi interp/reserve.cmi \
+    proofs/tacexpr.cmo pretyping/termops.cmi interp/topconstr.cmi \
     lib/util.cmi toplevel/vernacexpr.cmo translate/ppvernacnew.cmi 
-translate/ppvernacnew.cmx: parsing/ast.cmx parsing/coqast.cmx \
-    library/decl_kinds.cmx parsing/egrammar.cmx parsing/extend.cmx \
+translate/ppvernacnew.cmx: parsing/ast.cmx interp/constrextern.cmx \
+    interp/constrintern.cmx parsing/coqast.cmx library/decl_kinds.cmx \
+    parsing/egrammar.cmx pretyping/evd.cmx parsing/extend.cmx \
     interp/genarg.cmx library/global.cmx library/goptions.cmx \
     library/libnames.cmx library/nameops.cmx kernel/names.cmx \
-    library/nametab.cmx parsing/pcoq.cmx proofs/pfedit.cmx lib/pp.cmx \
-    translate/ppconstrnew.cmx interp/ppextend.cmx translate/pptacticnew.cmx \
-    pretyping/rawterm.cmx proofs/tacexpr.cmx interp/topconstr.cmx \
+    library/nametab.cmx lib/options.cmx parsing/pcoq.cmx proofs/pfedit.cmx \
+    lib/pp.cmx translate/ppconstrnew.cmx interp/ppextend.cmx \
+    translate/pptacticnew.cmx pretyping/rawterm.cmx interp/reserve.cmx \
+    proofs/tacexpr.cmx pretyping/termops.cmx interp/topconstr.cmx \
     lib/util.cmx toplevel/vernacexpr.cmx translate/ppvernacnew.cmi 
 contrib/cc/ccalgo.cmo: kernel/names.cmi kernel/term.cmi contrib/cc/ccalgo.cmi 
 contrib/cc/ccalgo.cmx: kernel/names.cmx kernel/term.cmx contrib/cc/ccalgo.cmi 
@@ -2269,15 +2273,15 @@ contrib/cc/ccproof.cmx: contrib/cc/ccalgo.cmx kernel/names.cmx \
 contrib/cc/cctac.cmo: contrib/cc/ccalgo.cmi contrib/cc/ccproof.cmi \
     toplevel/cerrors.cmi interp/coqlib.cmi parsing/egrammar.cmi \
     pretyping/evd.cmi library/libnames.cmi library/library.cmi \
-    library/nameops.cmi kernel/names.cmi library/nametab.cmi parsing/pcoq.cmi \
-    lib/pp.cmi parsing/pptactic.cmi proofs/proof_type.cmi proofs/refiner.cmi \
+    library/nameops.cmi kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi \
+    parsing/pptactic.cmi proofs/proof_type.cmi proofs/refiner.cmi \
     tactics/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
     tactics/tactics.cmi kernel/term.cmi lib/util.cmi 
 contrib/cc/cctac.cmx: contrib/cc/ccalgo.cmx contrib/cc/ccproof.cmx \
     toplevel/cerrors.cmx interp/coqlib.cmx parsing/egrammar.cmx \
     pretyping/evd.cmx library/libnames.cmx library/library.cmx \
-    library/nameops.cmx kernel/names.cmx library/nametab.cmx parsing/pcoq.cmx \
-    lib/pp.cmx parsing/pptactic.cmx proofs/proof_type.cmx proofs/refiner.cmx \
+    library/nameops.cmx kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx \
+    parsing/pptactic.cmx proofs/proof_type.cmx proofs/refiner.cmx \
     tactics/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
     tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
 contrib/correctness/pcic.cmo: kernel/declarations.cmi library/declare.cmi \
@@ -2641,43 +2645,37 @@ contrib/extraction/table.cmx: kernel/declarations.cmx kernel/environ.cmx \
     lib/pp.cmx parsing/printer.cmx kernel/reduction.cmx library/summary.cmx \
     kernel/term.cmx lib/util.cmx contrib/extraction/table.cmi 
 contrib/field/field.cmo: toplevel/cerrors.cmi interp/constrintern.cmi \
-    library/declare.cmi parsing/egrammar.cmi pretyping/evd.cmi \
+    interp/coqlib.cmi parsing/egrammar.cmi pretyping/evd.cmi \
     parsing/extend.cmi interp/genarg.cmi library/global.cmi lib/gmap.cmi \
     library/lib.cmi library/libnames.cmi library/libobject.cmi \
     library/library.cmi kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi \
     translate/ppconstrnew.cmi parsing/pptactic.cmi proofs/proof_type.cmi \
-    contrib/ring/quote.cmo pretyping/rawterm.cmi pretyping/reductionops.cmi \
-    proofs/refiner.cmi contrib/ring/ring.cmo library/summary.cmi \
-    proofs/tacexpr.cmo tactics/tacinterp.cmi proofs/tacmach.cmi \
-    tactics/tacticals.cmi kernel/term.cmi interp/topconstr.cmi \
-    pretyping/typing.cmi lib/util.cmi toplevel/vernacexpr.cmo \
-    toplevel/vernacinterp.cmi 
+    contrib/ring/quote.cmo pretyping/reductionops.cmi proofs/refiner.cmi \
+    contrib/ring/ring.cmo library/summary.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    kernel/term.cmi interp/topconstr.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi 
 contrib/field/field.cmx: toplevel/cerrors.cmx interp/constrintern.cmx \
-    library/declare.cmx parsing/egrammar.cmx pretyping/evd.cmx \
+    interp/coqlib.cmx parsing/egrammar.cmx pretyping/evd.cmx \
     parsing/extend.cmx interp/genarg.cmx library/global.cmx lib/gmap.cmx \
     library/lib.cmx library/libnames.cmx library/libobject.cmx \
     library/library.cmx kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx \
     translate/ppconstrnew.cmx parsing/pptactic.cmx proofs/proof_type.cmx \
-    contrib/ring/quote.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
-    proofs/refiner.cmx contrib/ring/ring.cmx library/summary.cmx \
-    proofs/tacexpr.cmx tactics/tacinterp.cmx proofs/tacmach.cmx \
-    tactics/tacticals.cmx kernel/term.cmx interp/topconstr.cmx \
-    pretyping/typing.cmx lib/util.cmx toplevel/vernacexpr.cmx \
-    toplevel/vernacinterp.cmx 
-contrib/fourier/fourierR.cmo: proofs/clenv.cmi interp/constrintern.cmi \
-    tactics/contradiction.cmi interp/coqlib.cmi tactics/equality.cmi \
-    pretyping/evd.cmi contrib/fourier/fourier.cmo library/global.cmi \
+    contrib/ring/quote.cmx pretyping/reductionops.cmx proofs/refiner.cmx \
+    contrib/ring/ring.cmx library/summary.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    kernel/term.cmx interp/topconstr.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx toplevel/vernacinterp.cmx 
+contrib/fourier/fourierR.cmo: proofs/clenv.cmi tactics/contradiction.cmi \
+    interp/coqlib.cmi tactics/equality.cmi contrib/fourier/fourier.cmo \
     library/libnames.cmi library/library.cmi kernel/names.cmi \
-    parsing/pcoq.cmi contrib/ring/ring.cmo proofs/tacmach.cmi \
-    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
-    toplevel/vernacexpr.cmo 
-contrib/fourier/fourierR.cmx: proofs/clenv.cmx interp/constrintern.cmx \
-    tactics/contradiction.cmx interp/coqlib.cmx tactics/equality.cmx \
-    pretyping/evd.cmx contrib/fourier/fourier.cmx library/global.cmx \
+    contrib/ring/ring.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi toplevel/vernacexpr.cmo 
+contrib/fourier/fourierR.cmx: proofs/clenv.cmx tactics/contradiction.cmx \
+    interp/coqlib.cmx tactics/equality.cmx contrib/fourier/fourier.cmx \
     library/libnames.cmx library/library.cmx kernel/names.cmx \
-    parsing/pcoq.cmx contrib/ring/ring.cmx proofs/tacmach.cmx \
-    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
-    toplevel/vernacexpr.cmx 
+    contrib/ring/ring.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx toplevel/vernacexpr.cmx 
 contrib/fourier/g_fourier.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
     contrib/fourier/fourierR.cmo parsing/pcoq.cmi lib/pp.cmi \
     parsing/pptactic.cmi proofs/refiner.cmi 
@@ -2691,10 +2689,10 @@ contrib/funind/tacinv.cmo: toplevel/cerrors.cmi interp/constrintern.cmi \
     library/global.cmi pretyping/inductiveops.cmi kernel/names.cmi \
     parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
     proofs/proof_type.cmi pretyping/reductionops.cmi tactics/refine.cmi \
-    proofs/refiner.cmi kernel/safe_typing.cmi tactics/tacinterp.cmi \
-    contrib/funind/tacinvutils.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
-    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
-    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
+    proofs/refiner.cmi kernel/safe_typing.cmi tactics/setoid_replace.cmi \
+    tactics/tacinterp.cmi contrib/funind/tacinvutils.cmi proofs/tacmach.cmi \
+    pretyping/tacred.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
     toplevel/vernacinterp.cmi 
 contrib/funind/tacinv.cmx: toplevel/cerrors.cmx interp/constrintern.cmx \
     interp/coqlib.cmx library/decl_kinds.cmx library/declare.cmx \
@@ -2703,10 +2701,10 @@ contrib/funind/tacinv.cmx: toplevel/cerrors.cmx interp/constrintern.cmx \
     library/global.cmx pretyping/inductiveops.cmx kernel/names.cmx \
     parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
     proofs/proof_type.cmx pretyping/reductionops.cmx tactics/refine.cmx \
-    proofs/refiner.cmx kernel/safe_typing.cmx tactics/tacinterp.cmx \
-    contrib/funind/tacinvutils.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
-    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
-    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
+    proofs/refiner.cmx kernel/safe_typing.cmx tactics/setoid_replace.cmx \
+    tactics/tacinterp.cmx contrib/funind/tacinvutils.cmx proofs/tacmach.cmx \
+    pretyping/tacred.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
     toplevel/vernacinterp.cmx 
 contrib/funind/tacinvutils.cmo: interp/coqlib.cmi kernel/declarations.cmi \
     library/declare.cmi kernel/environ.cmi pretyping/evd.cmi \
@@ -3048,20 +3046,20 @@ contrib/linear/unif.cmx: contrib/linear/dpctypes.cmx \
     contrib/linear/unif.cmi 
 contrib/omega/coq_omega.cmo: parsing/ast.cmi proofs/clenv.cmi \
     kernel/closure.cmi tactics/contradiction.cmi interp/coqlib.cmi \
-    kernel/declarations.cmi library/declare.cmi kernel/environ.cmi \
-    tactics/equality.cmi proofs/evar_refiner.cmi library/goptions.cmi \
-    kernel/inductive.cmi library/libnames.cmi library/library.cmi \
-    proofs/logic.cmi library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    kernel/declarations.cmi kernel/environ.cmi tactics/equality.cmi \
+    proofs/evar_refiner.cmi library/goptions.cmi kernel/inductive.cmi \
+    library/libnames.cmi library/library.cmi proofs/logic.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
     contrib/omega/omega.cmo lib/pp.cmi parsing/printer.cmi \
     proofs/proof_type.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
     kernel/sign.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
     tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi 
 contrib/omega/coq_omega.cmx: parsing/ast.cmx proofs/clenv.cmx \
     kernel/closure.cmx tactics/contradiction.cmx interp/coqlib.cmx \
-    kernel/declarations.cmx library/declare.cmx kernel/environ.cmx \
-    tactics/equality.cmx proofs/evar_refiner.cmx library/goptions.cmx \
-    kernel/inductive.cmx library/libnames.cmx library/library.cmx \
-    proofs/logic.cmx library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    kernel/declarations.cmx kernel/environ.cmx tactics/equality.cmx \
+    proofs/evar_refiner.cmx library/goptions.cmx kernel/inductive.cmx \
+    library/libnames.cmx library/library.cmx proofs/logic.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
     contrib/omega/omega.cmx lib/pp.cmx parsing/printer.cmx \
     proofs/proof_type.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
     kernel/sign.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
@@ -3088,40 +3086,40 @@ contrib/ring/g_ring.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
     interp/genarg.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
     contrib/ring/quote.cmx proofs/refiner.cmx contrib/ring/ring.cmx \
     toplevel/vernacinterp.cmx 
-contrib/ring/quote.cmo: library/declare.cmi kernel/environ.cmi \
-    library/global.cmi pretyping/instantiate.cmi library/libnames.cmi \
-    library/library.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
-    proofs/proof_trees.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
-    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi 
-contrib/ring/quote.cmx: library/declare.cmx kernel/environ.cmx \
-    library/global.cmx pretyping/instantiate.cmx library/libnames.cmx \
-    library/library.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
-    proofs/proof_trees.cmx proofs/tacexpr.cmx proofs/tacmach.cmx \
-    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx 
+contrib/ring/quote.cmo: interp/coqlib.cmi kernel/environ.cmi \
+    library/global.cmi pretyping/instantiate.cmi library/library.cmi \
+    kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi 
+contrib/ring/quote.cmx: interp/coqlib.cmx kernel/environ.cmx \
+    library/global.cmx pretyping/instantiate.cmx library/library.cmx \
+    kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx 
 contrib/ring/ring.cmo: kernel/closure.cmi interp/constrintern.cmi \
-    interp/coqlib.cmi library/declare.cmi tactics/equality.cmi \
-    pretyping/evd.cmi library/global.cmi tactics/hiddentac.cmi \
-    tactics/hipattern.cmi library/lib.cmi library/libnames.cmi \
-    library/libobject.cmi library/library.cmi library/nameops.cmi \
-    kernel/names.cmi library/nametab.cmi lib/options.cmi \
-    pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi contrib/ring/quote.cmo pretyping/reductionops.cmi \
-    tactics/setoid_replace.cmi library/summary.cmi proofs/tacexpr.cmo \
-    proofs/tacmach.cmi pretyping/tacred.cmi tactics/tacticals.cmi \
-    tactics/tactics.cmi kernel/term.cmi pretyping/typing.cmi lib/util.cmi \
-    toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi 
+    interp/coqlib.cmi tactics/equality.cmi pretyping/evd.cmi \
+    library/global.cmi tactics/hiddentac.cmi tactics/hipattern.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    library/library.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi pretyping/pattern.cmi lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi contrib/ring/quote.cmo \
+    pretyping/reductionops.cmi tactics/setoid_replace.cmi library/summary.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi pretyping/tacred.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacexpr.cmo \
+    toplevel/vernacinterp.cmi 
 contrib/ring/ring.cmx: kernel/closure.cmx interp/constrintern.cmx \
-    interp/coqlib.cmx library/declare.cmx tactics/equality.cmx \
-    pretyping/evd.cmx library/global.cmx tactics/hiddentac.cmx \
-    tactics/hipattern.cmx library/lib.cmx library/libnames.cmx \
-    library/libobject.cmx library/library.cmx library/nameops.cmx \
-    kernel/names.cmx library/nametab.cmx lib/options.cmx \
-    pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
-    proofs/proof_trees.cmx contrib/ring/quote.cmx pretyping/reductionops.cmx \
-    tactics/setoid_replace.cmx library/summary.cmx proofs/tacexpr.cmx \
-    proofs/tacmach.cmx pretyping/tacred.cmx tactics/tacticals.cmx \
-    tactics/tactics.cmx kernel/term.cmx pretyping/typing.cmx lib/util.cmx \
-    toplevel/vernacexpr.cmx toplevel/vernacinterp.cmx 
+    interp/coqlib.cmx tactics/equality.cmx pretyping/evd.cmx \
+    library/global.cmx tactics/hiddentac.cmx tactics/hipattern.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    library/library.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx pretyping/pattern.cmx lib/pp.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx contrib/ring/quote.cmx \
+    pretyping/reductionops.cmx tactics/setoid_replace.cmx library/summary.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacexpr.cmx \
+    toplevel/vernacinterp.cmx 
 contrib/romega/const_omega.cmo: library/declare.cmi library/libnames.cmi \
     kernel/names.cmi library/nametab.cmi kernel/term.cmi lib/util.cmi 
 contrib/romega/const_omega.cmx: library/declare.cmx library/libnames.cmx \