Stdlib -> Coqlib, Stock disparait

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

1 files changed, 172 insertions, 175 deletions

diff --git a/.depend b/.depend
index 6414d5df8..859804fbf 100644
--- a/.depend
+++ b/.depend
@@ -8,7 +8,7 @@ kernel/environ.cmi: kernel/declarations.cmi kernel/names.cmi lib/pp.cmi \
     kernel/sign.cmi kernel/term.cmi kernel/univ.cmi 
 kernel/evd.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi 
 kernel/indtypes.cmi: kernel/declarations.cmi kernel/environ.cmi \
-    kernel/names.cmi kernel/term.cmi kernel/univ.cmi 
+    kernel/names.cmi kernel/sign.cmi kernel/term.cmi kernel/univ.cmi 
 kernel/inductive.cmi: kernel/declarations.cmi kernel/environ.cmi \
     kernel/evd.cmi kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
     kernel/univ.cmi 
@@ -28,8 +28,6 @@ kernel/typeops.cmi: kernel/environ.cmi kernel/evd.cmi kernel/inductive.cmi \
     kernel/names.cmi kernel/sign.cmi kernel/term.cmi kernel/univ.cmi 
 kernel/univ.cmi: kernel/names.cmi lib/pp.cmi 
 lib/pp.cmi: lib/pp_control.cmi 
-lib/system.cmi: lib/pp.cmi 
-lib/util.cmi: lib/pp.cmi 
 library/declare.cmi: kernel/cooking.cmi kernel/declarations.cmi \
     kernel/environ.cmi kernel/evd.cmi kernel/inductive.cmi \
     library/libobject.cmi kernel/names.cmi kernel/sign.cmi kernel/term.cmi 
@@ -48,12 +46,15 @@ library/library.cmi: library/lib.cmi library/libobject.cmi kernel/names.cmi \
 library/nametab.cmi: library/libobject.cmi kernel/names.cmi kernel/term.cmi \
     lib/util.cmi 
 library/summary.cmi: kernel/names.cmi 
+lib/system.cmi: lib/pp.cmi 
+lib/util.cmi: lib/pp.cmi 
 parsing/ast.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/names.cmi \
     parsing/pcoq.cmi lib/pp.cmi 
 parsing/astterm.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/evd.cmi \
-    kernel/names.cmi pretyping/pattern.cmi pretyping/rawterm.cmi \
-    kernel/sign.cmi kernel/term.cmi 
+    library/impargs.cmi kernel/names.cmi pretyping/pattern.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
 parsing/coqast.cmi: lib/dyn.cmi 
+parsing/coqlib.cmi: pretyping/pattern.cmi kernel/term.cmi 
 parsing/egrammar.cmi: parsing/ast.cmi parsing/coqast.cmi parsing/extend.cmi \
     parsing/pcoq.cmi 
 parsing/esyntax.cmi: parsing/ast.cmi parsing/coqast.cmi parsing/extend.cmi \
@@ -63,15 +64,14 @@ parsing/extend.cmi: parsing/ast.cmi parsing/coqast.cmi parsing/pcoq.cmi \
 parsing/g_minicoq.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
     kernel/term.cmi 
 parsing/pcoq.cmi: parsing/coqast.cmi 
-parsing/pretty.cmi: kernel/declarations.cmi kernel/environ.cmi \
-    kernel/inductive.cmi library/lib.cmi kernel/names.cmi lib/pp.cmi \
-    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi 
+parsing/pretty.cmi: kernel/environ.cmi kernel/inductive.cmi library/lib.cmi \
+    kernel/names.cmi lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi \
+    kernel/term.cmi 
 parsing/printer.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/names.cmi \
     pretyping/pattern.cmi lib/pp.cmi pretyping/rawterm.cmi kernel/sign.cmi \
     kernel/term.cmi 
 parsing/search.cmi: kernel/environ.cmi kernel/names.cmi pretyping/pattern.cmi \
     lib/pp.cmi kernel/term.cmi 
-parsing/stdlib.cmi: kernel/term.cmi 
 parsing/termast.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/names.cmi \
     pretyping/pattern.cmi pretyping/rawterm.cmi kernel/sign.cmi \
     kernel/term.cmi 
@@ -127,7 +127,6 @@ proofs/proof_type.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/evd.cmi \
     lib/util.cmi 
 proofs/refiner.cmi: lib/pp.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
     kernel/sign.cmi kernel/term.cmi 
-proofs/stock.cmi: kernel/names.cmi 
 proofs/tacinterp.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/environ.cmi \
     kernel/names.cmi lib/pp.cmi proofs/proof_type.cmi proofs/tacmach.cmi \
     proofs/tactic_debug.cmi kernel/term.cmi 
@@ -155,8 +154,7 @@ tactics/equality.cmi: parsing/coqast.cmi kernel/environ.cmi kernel/evd.cmi \
 tactics/hiddentac.cmi: kernel/names.cmi proofs/proof_type.cmi \
     tactics/tacentries.cmi proofs/tacmach.cmi kernel/term.cmi 
 tactics/hipattern.cmi: kernel/evd.cmi kernel/names.cmi pretyping/pattern.cmi \
-    proofs/proof_trees.cmi kernel/sign.cmi proofs/stock.cmi kernel/term.cmi \
-    lib/util.cmi 
+    proofs/proof_trees.cmi kernel/sign.cmi kernel/term.cmi lib/util.cmi 
 tactics/inv.cmi: kernel/names.cmi proofs/tacmach.cmi kernel/term.cmi 
 tactics/nbtermdn.cmi: tactics/btermdn.cmi pretyping/pattern.cmi \
     kernel/term.cmi 
@@ -194,11 +192,12 @@ toplevel/recordobj.cmi: kernel/term.cmi
 toplevel/searchisos.cmi: library/libobject.cmi kernel/names.cmi \
     kernel/term.cmi 
 toplevel/toplevel.cmi: parsing/pcoq.cmi lib/pp.cmi 
-toplevel/vernac.cmi: parsing/coqast.cmi parsing/pcoq.cmi 
-toplevel/vernacentries.cmi: kernel/environ.cmi kernel/names.cmi \
-    proofs/proof_type.cmi kernel/term.cmi toplevel/vernacinterp.cmi 
+toplevel/vernacentries.cmi: parsing/coqast.cmi kernel/environ.cmi \
+    kernel/names.cmi proofs/proof_type.cmi kernel/term.cmi \
+    toplevel/vernacinterp.cmi 
 toplevel/vernacinterp.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/names.cmi \
     proofs/proof_type.cmi 
+toplevel/vernac.cmi: parsing/coqast.cmi parsing/pcoq.cmi 
 contrib/extraction/extraction.cmi: contrib/extraction/miniml.cmi \
     kernel/names.cmi 
 contrib/extraction/miniml.cmi: kernel/names.cmi 
@@ -207,18 +206,16 @@ config/coq_config.cmo: config/coq_config.cmi
 config/coq_config.cmx: config/coq_config.cmi 
 dev/db_printers.cmo: kernel/names.cmi lib/pp.cmi 
 dev/db_printers.cmx: kernel/names.cmx lib/pp.cmx 
-dev/top_printers.cmo: parsing/ast.cmi parsing/astterm.cmi proofs/clenv.cmi \
-    toplevel/command.cmi kernel/environ.cmi toplevel/errors.cmi \
-    kernel/evd.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi proofs/refiner.cmi kernel/sign.cmi lib/system.cmi \
-    proofs/tacmach.cmi kernel/term.cmi parsing/termast.cmi kernel/univ.cmi \
-    toplevel/vernacentries.cmi toplevel/vernacinterp.cmi 
-dev/top_printers.cmx: parsing/ast.cmx parsing/astterm.cmx proofs/clenv.cmx \
-    toplevel/command.cmx kernel/environ.cmx toplevel/errors.cmx \
-    kernel/evd.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
-    proofs/proof_trees.cmx proofs/refiner.cmx kernel/sign.cmx lib/system.cmx \
-    proofs/tacmach.cmx kernel/term.cmx parsing/termast.cmx kernel/univ.cmx \
-    toplevel/vernacentries.cmx toplevel/vernacinterp.cmx 
+dev/top_printers.cmo: parsing/ast.cmi proofs/clenv.cmi kernel/environ.cmi \
+    toplevel/errors.cmi kernel/evd.cmi kernel/names.cmi lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi proofs/refiner.cmi \
+    kernel/sign.cmi lib/system.cmi proofs/tacmach.cmi kernel/term.cmi \
+    parsing/termast.cmi kernel/univ.cmi toplevel/vernacinterp.cmi 
+dev/top_printers.cmx: parsing/ast.cmx proofs/clenv.cmx kernel/environ.cmx \
+    toplevel/errors.cmx kernel/evd.cmx kernel/names.cmx lib/pp.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx proofs/refiner.cmx \
+    kernel/sign.cmx lib/system.cmx proofs/tacmach.cmx kernel/term.cmx \
+    parsing/termast.cmx kernel/univ.cmx toplevel/vernacinterp.cmx 
 kernel/closure.cmo: kernel/declarations.cmi kernel/environ.cmi kernel/evd.cmi \
     kernel/instantiate.cmi kernel/names.cmi lib/pp.cmi kernel/term.cmi \
     kernel/univ.cmi lib/util.cmi kernel/closure.cmi 
@@ -247,12 +244,12 @@ kernel/evd.cmx: kernel/names.cmx kernel/sign.cmx kernel/term.cmx lib/util.cmx \
     kernel/evd.cmi 
 kernel/indtypes.cmo: kernel/declarations.cmi kernel/environ.cmi \
     kernel/evd.cmi kernel/inductive.cmi kernel/instantiate.cmi \
-    kernel/names.cmi kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
-    kernel/typeops.cmi lib/util.cmi kernel/indtypes.cmi 
+    kernel/names.cmi lib/options.cmi kernel/reduction.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/typeops.cmi lib/util.cmi kernel/indtypes.cmi 
 kernel/indtypes.cmx: kernel/declarations.cmx kernel/environ.cmx \
     kernel/evd.cmx kernel/inductive.cmx kernel/instantiate.cmx \
-    kernel/names.cmx kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
-    kernel/typeops.cmx lib/util.cmx kernel/indtypes.cmi 
+    kernel/names.cmx lib/options.cmx kernel/reduction.cmx kernel/sign.cmx \
+    kernel/term.cmx kernel/typeops.cmx lib/util.cmx kernel/indtypes.cmi 
 kernel/inductive.cmo: kernel/declarations.cmi kernel/environ.cmi \
     kernel/instantiate.cmi kernel/names.cmi kernel/reduction.cmi \
     kernel/sign.cmi kernel/term.cmi kernel/univ.cmi lib/util.cmi \
@@ -262,11 +259,11 @@ kernel/inductive.cmx: kernel/declarations.cmx kernel/environ.cmx \
     kernel/sign.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx \
     kernel/inductive.cmi 
 kernel/instantiate.cmo: kernel/declarations.cmi kernel/environ.cmi \
-    kernel/evd.cmi kernel/names.cmi lib/pp.cmi kernel/sign.cmi \
-    kernel/term.cmi lib/util.cmi kernel/instantiate.cmi 
+    kernel/evd.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
+    kernel/sign.cmi kernel/term.cmi lib/util.cmi kernel/instantiate.cmi 
 kernel/instantiate.cmx: kernel/declarations.cmx kernel/environ.cmx \
-    kernel/evd.cmx kernel/names.cmx lib/pp.cmx kernel/sign.cmx \
-    kernel/term.cmx lib/util.cmx kernel/instantiate.cmi 
+    kernel/evd.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
+    kernel/sign.cmx kernel/term.cmx lib/util.cmx kernel/instantiate.cmi 
 kernel/names.cmo: lib/hashcons.cmi lib/pp.cmi lib/util.cmi kernel/names.cmi 
 kernel/names.cmx: lib/hashcons.cmx lib/pp.cmx lib/util.cmx kernel/names.cmi 
 kernel/reduction.cmo: kernel/closure.cmi kernel/declarations.cmi \
@@ -279,18 +276,20 @@ kernel/reduction.cmx: kernel/closure.cmx kernel/declarations.cmx \
     kernel/reduction.cmi 
 kernel/safe_typing.cmo: kernel/cooking.cmi kernel/declarations.cmi \
     kernel/environ.cmi kernel/evd.cmi kernel/indtypes.cmi \
-    kernel/inductive.cmi kernel/names.cmi lib/pp.cmi kernel/reduction.cmi \
-    kernel/sign.cmi kernel/term.cmi kernel/type_errors.cmi kernel/typeops.cmi \
-    kernel/univ.cmi lib/util.cmi kernel/safe_typing.cmi 
+    kernel/inductive.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi kernel/univ.cmi lib/util.cmi \
+    kernel/safe_typing.cmi 
 kernel/safe_typing.cmx: kernel/cooking.cmx kernel/declarations.cmx \
     kernel/environ.cmx kernel/evd.cmx kernel/indtypes.cmx \
-    kernel/inductive.cmx kernel/names.cmx lib/pp.cmx kernel/reduction.cmx \
-    kernel/sign.cmx kernel/term.cmx kernel/type_errors.cmx kernel/typeops.cmx \
-    kernel/univ.cmx lib/util.cmx kernel/safe_typing.cmi 
-kernel/sign.cmo: kernel/names.cmi kernel/term.cmi lib/util.cmi \
-    kernel/sign.cmi 
-kernel/sign.cmx: kernel/names.cmx kernel/term.cmx lib/util.cmx \
-    kernel/sign.cmi 
+    kernel/inductive.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
+    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx kernel/univ.cmx lib/util.cmx \
+    kernel/safe_typing.cmi 
+kernel/sign.cmo: kernel/names.cmi lib/options.cmi kernel/term.cmi \
+    lib/util.cmi kernel/sign.cmi 
+kernel/sign.cmx: kernel/names.cmx lib/options.cmx kernel/term.cmx \
+    lib/util.cmx kernel/sign.cmi 
 kernel/term.cmo: lib/hashcons.cmi kernel/names.cmi lib/pp.cmi kernel/univ.cmi \
     lib/util.cmi kernel/term.cmi 
 kernel/term.cmx: lib/hashcons.cmx kernel/names.cmx lib/pp.cmx kernel/univ.cmx \
@@ -319,30 +318,22 @@ lib/dyn.cmo: lib/util.cmi lib/dyn.cmi
 lib/dyn.cmx: lib/util.cmx lib/dyn.cmi 
 lib/edit.cmo: lib/bstack.cmi lib/pp.cmi lib/util.cmi lib/edit.cmi 
 lib/edit.cmx: lib/bstack.cmx lib/pp.cmx lib/util.cmx lib/edit.cmi 
-lib/gmap.cmo: lib/gmap.cmi 
-lib/gmap.cmx: lib/gmap.cmi 
 lib/gmapl.cmo: lib/gmap.cmi lib/util.cmi lib/gmapl.cmi 
 lib/gmapl.cmx: lib/gmap.cmx lib/util.cmx lib/gmapl.cmi 
+lib/gmap.cmo: lib/gmap.cmi 
+lib/gmap.cmx: lib/gmap.cmi 
 lib/gset.cmo: lib/gset.cmi 
 lib/gset.cmx: lib/gset.cmi 
 lib/hashcons.cmo: lib/hashcons.cmi 
 lib/hashcons.cmx: lib/hashcons.cmi 
 lib/options.cmo: lib/util.cmi lib/options.cmi 
 lib/options.cmx: lib/util.cmx lib/options.cmi 
-lib/pp.cmo: lib/pp_control.cmi lib/pp.cmi 
-lib/pp.cmx: lib/pp_control.cmx lib/pp.cmi 
 lib/pp_control.cmo: lib/pp_control.cmi 
 lib/pp_control.cmx: lib/pp_control.cmi 
+lib/pp.cmo: lib/pp_control.cmi lib/pp.cmi 
+lib/pp.cmx: lib/pp_control.cmx lib/pp.cmi 
 lib/profile.cmo: lib/profile.cmi 
 lib/profile.cmx: lib/profile.cmi 
-lib/stamps.cmo: lib/stamps.cmi 
-lib/stamps.cmx: lib/stamps.cmi 
-lib/system.cmo: config/coq_config.cmi lib/pp.cmi lib/util.cmi lib/system.cmi 
-lib/system.cmx: config/coq_config.cmx lib/pp.cmx lib/util.cmx lib/system.cmi 
-lib/tlm.cmo: lib/gmap.cmi lib/gset.cmi lib/tlm.cmi 
-lib/tlm.cmx: lib/gmap.cmx lib/gset.cmx lib/tlm.cmi 
-lib/util.cmo: lib/pp.cmi lib/util.cmi 
-lib/util.cmx: lib/pp.cmx lib/util.cmi 
 library/declare.cmo: kernel/cooking.cmi kernel/declarations.cmi \
     kernel/environ.cmi kernel/evd.cmi library/global.cmi library/impargs.cmi \
     library/indrec.cmi kernel/inductive.cmi library/lib.cmi \
@@ -417,6 +408,14 @@ library/summary.cmo: lib/dyn.cmi kernel/names.cmi lib/pp.cmi lib/util.cmi \
     library/summary.cmi 
 library/summary.cmx: lib/dyn.cmx kernel/names.cmx lib/pp.cmx lib/util.cmx \
     library/summary.cmi 
+lib/stamps.cmo: lib/stamps.cmi 
+lib/stamps.cmx: lib/stamps.cmi 
+lib/system.cmo: config/coq_config.cmi lib/pp.cmi lib/util.cmi lib/system.cmi 
+lib/system.cmx: config/coq_config.cmx lib/pp.cmx lib/util.cmx lib/system.cmi 
+lib/tlm.cmo: lib/gmap.cmi lib/gset.cmi lib/tlm.cmi 
+lib/tlm.cmx: lib/gmap.cmx lib/gset.cmx lib/tlm.cmi 
+lib/util.cmo: lib/pp.cmi lib/util.cmi 
+lib/util.cmx: lib/pp.cmx lib/util.cmi 
 parsing/ast.cmo: parsing/coqast.cmi lib/dyn.cmi lib/hashcons.cmi \
     kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi lib/util.cmi parsing/ast.cmi 
 parsing/ast.cmx: parsing/coqast.cmx lib/dyn.cmx lib/hashcons.cmx \
@@ -439,6 +438,12 @@ parsing/astterm.cmx: parsing/ast.cmx parsing/coqast.cmx library/declare.cmx \
     pretyping/typing.cmx kernel/univ.cmx lib/util.cmx parsing/astterm.cmi 
 parsing/coqast.cmo: lib/dyn.cmi lib/hashcons.cmi parsing/coqast.cmi 
 parsing/coqast.cmx: lib/dyn.cmx lib/hashcons.cmx parsing/coqast.cmi 
+parsing/coqlib.cmo: library/declare.cmi kernel/evd.cmi library/global.cmi \
+    kernel/names.cmi library/nametab.cmi pretyping/pattern.cmi \
+    kernel/term.cmi lib/util.cmi parsing/coqlib.cmi 
+parsing/coqlib.cmx: library/declare.cmx kernel/evd.cmx library/global.cmx \
+    kernel/names.cmx library/nametab.cmx pretyping/pattern.cmx \
+    kernel/term.cmx lib/util.cmx parsing/coqlib.cmi 
 parsing/egrammar.cmo: parsing/ast.cmi parsing/coqast.cmi parsing/extend.cmi \
     parsing/lexer.cmi parsing/pcoq.cmi lib/pp.cmi lib/util.cmi \
     parsing/egrammar.cmi 
@@ -468,13 +473,11 @@ parsing/g_minicoq.cmx: kernel/environ.cmx parsing/lexer.cmx kernel/names.cmx \
     lib/pp.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx \
     parsing/g_minicoq.cmi 
 parsing/g_natsyntax.cmo: parsing/ast.cmi parsing/coqast.cmi \
-    parsing/esyntax.cmi kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi \
-    parsing/stdlib.cmi parsing/termast.cmi lib/util.cmi \
-    parsing/g_natsyntax.cmi 
+    parsing/coqlib.cmi parsing/esyntax.cmi kernel/names.cmi parsing/pcoq.cmi \
+    lib/pp.cmi parsing/termast.cmi lib/util.cmi parsing/g_natsyntax.cmi 
 parsing/g_natsyntax.cmx: parsing/ast.cmx parsing/coqast.cmx \
-    parsing/esyntax.cmx kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx \
-    parsing/stdlib.cmx parsing/termast.cmx lib/util.cmx \
-    parsing/g_natsyntax.cmi 
+    parsing/coqlib.cmx parsing/esyntax.cmx kernel/names.cmx parsing/pcoq.cmx \
+    lib/pp.cmx parsing/termast.cmx lib/util.cmx parsing/g_natsyntax.cmi 
 parsing/g_prim.cmo: parsing/coqast.cmi parsing/pcoq.cmi toplevel/vernac.cmi 
 parsing/g_prim.cmx: parsing/coqast.cmx parsing/pcoq.cmx toplevel/vernac.cmx 
 parsing/g_proofs.cmo: parsing/coqast.cmi parsing/pcoq.cmi lib/pp.cmi \
@@ -545,10 +548,6 @@ parsing/search.cmx: parsing/astterm.cmx parsing/coqast.cmx \
     library/library.cmx kernel/names.cmx library/nametab.cmx \
     pretyping/pattern.cmx lib/pp.cmx parsing/pretty.cmx parsing/printer.cmx \
     kernel/term.cmx pretyping/typing.cmx lib/util.cmx parsing/search.cmi 
-parsing/stdlib.cmo: library/declare.cmi kernel/names.cmi kernel/term.cmi \
-    parsing/stdlib.cmi 
-parsing/stdlib.cmx: library/declare.cmx kernel/names.cmx kernel/term.cmx \
-    parsing/stdlib.cmi 
 parsing/termast.cmo: parsing/ast.cmi pretyping/classops.cmi \
     parsing/coqast.cmi library/declare.cmi pretyping/detyping.cmi \
     kernel/environ.cmi library/impargs.cmi kernel/inductive.cmi \
@@ -769,10 +768,6 @@ proofs/refiner.cmx: parsing/ast.cmx kernel/environ.cmx kernel/evd.cmx \
     proofs/proof_trees.cmx proofs/proof_type.cmx kernel/reduction.cmx \
     kernel/sign.cmx lib/stamps.cmx kernel/term.cmx kernel/type_errors.cmx \
     lib/util.cmx proofs/refiner.cmi 
-proofs/stock.cmo: lib/bij.cmi lib/gmap.cmi lib/gmapl.cmi library/library.cmi \
-    kernel/names.cmi lib/pp.cmi lib/util.cmi proofs/stock.cmi 
-proofs/stock.cmx: lib/bij.cmx lib/gmap.cmx lib/gmapl.cmx library/library.cmx \
-    kernel/names.cmx lib/pp.cmx lib/util.cmx proofs/stock.cmi 
 proofs/tacinterp.cmo: parsing/ast.cmi parsing/astterm.cmi kernel/closure.cmi \
     parsing/coqast.cmi kernel/declarations.cmi library/declare.cmi \
     lib/dyn.cmi kernel/environ.cmi kernel/evd.cmi library/global.cmi \
@@ -895,66 +890,66 @@ tactics/elim.cmx: proofs/clenv.cmx tactics/hiddentac.cmx \
     proofs/proof_type.cmx kernel/reduction.cmx proofs/tacmach.cmx \
     tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx lib/util.cmx \
     tactics/elim.cmi 
-tactics/eqdecide.cmo: tactics/auto.cmi tactics/equality.cmi \
-    library/global.cmi tactics/hiddentac.cmi tactics/hipattern.cmi \
-    kernel/names.cmi pretyping/pattern.cmi proofs/proof_trees.cmi \
-    proofs/proof_type.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
-    tactics/tactics.cmi kernel/term.cmi lib/util.cmi 
-tactics/eqdecide.cmx: tactics/auto.cmx tactics/equality.cmx \
-    library/global.cmx tactics/hiddentac.cmx tactics/hipattern.cmx \
-    kernel/names.cmx pretyping/pattern.cmx proofs/proof_trees.cmx \
-    proofs/proof_type.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
-    tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
+tactics/eqdecide.cmo: tactics/auto.cmi parsing/coqlib.cmi \
+    tactics/equality.cmi library/global.cmi tactics/hiddentac.cmi \
+    tactics/hipattern.cmi kernel/names.cmi pretyping/pattern.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi 
+tactics/eqdecide.cmx: tactics/auto.cmx parsing/coqlib.cmx \
+    tactics/equality.cmx library/global.cmx tactics/hiddentac.cmx \
+    tactics/hipattern.cmx kernel/names.cmx pretyping/pattern.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
 tactics/equality.cmo: parsing/astterm.cmi parsing/coqast.cmi \
-    library/declare.cmi kernel/environ.cmi kernel/evd.cmi library/global.cmi \
-    lib/gmapl.cmi tactics/hipattern.cmi kernel/inductive.cmi \
-    kernel/instantiate.cmi library/lib.cmi library/libobject.cmi \
-    proofs/logic.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
-    proofs/proof_type.cmi kernel/reduction.cmi pretyping/retyping.cmi \
-    proofs/tacinterp.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
-    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
-    kernel/typeops.cmi pretyping/typing.cmi kernel/univ.cmi lib/util.cmi \
+    parsing/coqlib.cmi library/declare.cmi kernel/environ.cmi kernel/evd.cmi \
+    library/global.cmi lib/gmapl.cmi tactics/hipattern.cmi \
+    kernel/inductive.cmi kernel/instantiate.cmi library/lib.cmi \
+    library/libobject.cmi proofs/logic.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
+    kernel/reduction.cmi pretyping/retyping.cmi proofs/tacinterp.cmi \
+    proofs/tacmach.cmi pretyping/tacred.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi kernel/typeops.cmi \
+    pretyping/typing.cmi kernel/univ.cmi lib/util.cmi \
     toplevel/vernacinterp.cmi tactics/wcclausenv.cmi tactics/equality.cmi 
 tactics/equality.cmx: parsing/astterm.cmx parsing/coqast.cmx \
-    library/declare.cmx kernel/environ.cmx kernel/evd.cmx library/global.cmx \
-    lib/gmapl.cmx tactics/hipattern.cmx kernel/inductive.cmx \
-    kernel/instantiate.cmx library/lib.cmx library/libobject.cmx \
-    proofs/logic.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
-    proofs/proof_type.cmx kernel/reduction.cmx pretyping/retyping.cmx \
-    proofs/tacinterp.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
-    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
-    kernel/typeops.cmx pretyping/typing.cmx kernel/univ.cmx lib/util.cmx \
+    parsing/coqlib.cmx library/declare.cmx kernel/environ.cmx kernel/evd.cmx \
+    library/global.cmx lib/gmapl.cmx tactics/hipattern.cmx \
+    kernel/inductive.cmx kernel/instantiate.cmx library/lib.cmx \
+    library/libobject.cmx proofs/logic.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx proofs/proof_type.cmx \
+    kernel/reduction.cmx pretyping/retyping.cmx proofs/tacinterp.cmx \
+    proofs/tacmach.cmx pretyping/tacred.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx kernel/typeops.cmx \
+    pretyping/typing.cmx kernel/univ.cmx lib/util.cmx \
     toplevel/vernacinterp.cmx tactics/wcclausenv.cmx tactics/equality.cmi 
 tactics/hiddentac.cmo: proofs/proof_type.cmi tactics/tacentries.cmi \
     proofs/tacmach.cmi kernel/term.cmi tactics/hiddentac.cmi 
 tactics/hiddentac.cmx: proofs/proof_type.cmx tactics/tacentries.cmx \
     proofs/tacmach.cmx kernel/term.cmx tactics/hiddentac.cmi 
-tactics/hipattern.cmo: parsing/astterm.cmi proofs/clenv.cmi \
-    library/declare.cmi kernel/environ.cmi kernel/evd.cmi library/global.cmi \
-    kernel/inductive.cmi library/library.cmi kernel/names.cmi \
-    pretyping/pattern.cmi parsing/pcoq.cmi lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi kernel/reduction.cmi proofs/stock.cmi \
-    kernel/term.cmi lib/util.cmi tactics/hipattern.cmi 
-tactics/hipattern.cmx: parsing/astterm.cmx proofs/clenv.cmx \
-    library/declare.cmx kernel/environ.cmx kernel/evd.cmx library/global.cmx \
-    kernel/inductive.cmx library/library.cmx kernel/names.cmx \
-    pretyping/pattern.cmx parsing/pcoq.cmx lib/pp.cmx parsing/printer.cmx \
-    proofs/proof_trees.cmx kernel/reduction.cmx proofs/stock.cmx \
-    kernel/term.cmx lib/util.cmx tactics/hipattern.cmi 
-tactics/inv.cmo: tactics/auto.cmi proofs/clenv.cmi tactics/elim.cmi \
-    kernel/environ.cmi tactics/equality.cmi library/global.cmi \
-    kernel/inductive.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
-    parsing/printer.cmi proofs/proof_type.cmi kernel/reduction.cmi \
-    pretyping/retyping.cmi kernel/sign.cmi proofs/tacmach.cmi \
-    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
-    pretyping/typing.cmi lib/util.cmi tactics/wcclausenv.cmi tactics/inv.cmi 
-tactics/inv.cmx: tactics/auto.cmx proofs/clenv.cmx tactics/elim.cmx \
-    kernel/environ.cmx tactics/equality.cmx library/global.cmx \
-    kernel/inductive.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
-    parsing/printer.cmx proofs/proof_type.cmx kernel/reduction.cmx \
-    pretyping/retyping.cmx kernel/sign.cmx proofs/tacmach.cmx \
-    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
-    pretyping/typing.cmx lib/util.cmx tactics/wcclausenv.cmx tactics/inv.cmi 
+tactics/hipattern.cmo: proofs/clenv.cmi parsing/coqlib.cmi kernel/environ.cmi \
+    kernel/evd.cmi library/global.cmi kernel/inductive.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    kernel/reduction.cmi kernel/term.cmi lib/util.cmi tactics/hipattern.cmi 
+tactics/hipattern.cmx: proofs/clenv.cmx parsing/coqlib.cmx kernel/environ.cmx \
+    kernel/evd.cmx library/global.cmx kernel/inductive.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    kernel/reduction.cmx kernel/term.cmx lib/util.cmx tactics/hipattern.cmi 
+tactics/inv.cmo: tactics/auto.cmi proofs/clenv.cmi parsing/coqlib.cmi \
+    tactics/elim.cmi kernel/environ.cmi tactics/equality.cmi \
+    library/global.cmi kernel/inductive.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi kernel/reduction.cmi pretyping/retyping.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/typing.cmi lib/util.cmi \
+    tactics/wcclausenv.cmi tactics/inv.cmi 
+tactics/inv.cmx: tactics/auto.cmx proofs/clenv.cmx parsing/coqlib.cmx \
+    tactics/elim.cmx kernel/environ.cmx tactics/equality.cmx \
+    library/global.cmx kernel/inductive.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx kernel/reduction.cmx pretyping/retyping.cmx \
+    kernel/sign.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/typing.cmx lib/util.cmx \
+    tactics/wcclausenv.cmx tactics/inv.cmi 
 tactics/leminv.cmo: parsing/astterm.cmi proofs/clenv.cmi \
     kernel/declarations.cmi library/declare.cmi kernel/environ.cmi \
     kernel/evd.cmi library/global.cmi kernel/inductive.cmi tactics/inv.cmi \
@@ -1008,21 +1003,23 @@ tactics/tacticals.cmx: proofs/clenv.cmx parsing/coqast.cmx \
     parsing/termast.cmx lib/util.cmx tactics/wcclausenv.cmx \
     tactics/tacticals.cmi 
 tactics/tactics.cmo: parsing/astterm.cmi proofs/clenv.cmi kernel/closure.cmi \
-    kernel/declarations.cmi library/declare.cmi kernel/environ.cmi \
-    kernel/evd.cmi library/global.cmi tactics/hipattern.cmi \
-    library/indrec.cmi kernel/inductive.cmi proofs/logic.cmi kernel/names.cmi \
-    proofs/pfedit.cmi lib/pp.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
-    kernel/reduction.cmi kernel/sign.cmi lib/stamps.cmi proofs/tacinterp.cmi \
-    proofs/tacmach.cmi pretyping/tacred.cmi tactics/tacticals.cmi \
-    kernel/term.cmi lib/util.cmi tactics/tactics.cmi 
+    parsing/coqlib.cmi kernel/declarations.cmi library/declare.cmi \
+    kernel/environ.cmi kernel/evd.cmi library/global.cmi \
+    tactics/hipattern.cmi library/indrec.cmi kernel/inductive.cmi \
+    proofs/logic.cmi kernel/names.cmi proofs/pfedit.cmi lib/pp.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi kernel/reduction.cmi \
+    kernel/sign.cmi lib/stamps.cmi proofs/tacinterp.cmi proofs/tacmach.cmi \
+    pretyping/tacred.cmi tactics/tacticals.cmi kernel/term.cmi lib/util.cmi \
+    tactics/tactics.cmi 
 tactics/tactics.cmx: parsing/astterm.cmx proofs/clenv.cmx kernel/closure.cmx \
-    kernel/declarations.cmx library/declare.cmx kernel/environ.cmx \
-    kernel/evd.cmx library/global.cmx tactics/hipattern.cmx \
-    library/indrec.cmx kernel/inductive.cmx proofs/logic.cmx kernel/names.cmx \
-    proofs/pfedit.cmx lib/pp.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
-    kernel/reduction.cmx kernel/sign.cmx lib/stamps.cmx proofs/tacinterp.cmx \
-    proofs/tacmach.cmx pretyping/tacred.cmx tactics/tacticals.cmx \
-    kernel/term.cmx lib/util.cmx tactics/tactics.cmi 
+    parsing/coqlib.cmx kernel/declarations.cmx library/declare.cmx \
+    kernel/environ.cmx kernel/evd.cmx library/global.cmx \
+    tactics/hipattern.cmx library/indrec.cmx kernel/inductive.cmx \
+    proofs/logic.cmx kernel/names.cmx proofs/pfedit.cmx lib/pp.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx kernel/reduction.cmx \
+    kernel/sign.cmx lib/stamps.cmx proofs/tacinterp.cmx proofs/tacmach.cmx \
+    pretyping/tacred.cmx tactics/tacticals.cmx kernel/term.cmx lib/util.cmx \
+    tactics/tactics.cmi 
 tactics/tauto.cmo: parsing/ast.cmi parsing/coqast.cmi tactics/hipattern.cmi \
     kernel/names.cmi lib/pp.cmi proofs/proof_type.cmi proofs/tacinterp.cmi \
     proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi lib/util.cmi 
@@ -1041,10 +1038,10 @@ tactics/wcclausenv.cmx: proofs/clenv.cmx kernel/environ.cmx kernel/evd.cmx \
     library/global.cmx proofs/logic.cmx kernel/names.cmx lib/pp.cmx \
     proofs/proof_trees.cmx kernel/reduction.cmx kernel/sign.cmx \
     proofs/tacmach.cmx kernel/term.cmx lib/util.cmx tactics/wcclausenv.cmi 
-tools/coqdep.cmo: config/coq_config.cmi tools/coqdep_lexer.cmo 
-tools/coqdep.cmx: config/coq_config.cmx tools/coqdep_lexer.cmx 
 tools/coqdep_lexer.cmo: config/coq_config.cmi 
 tools/coqdep_lexer.cmx: config/coq_config.cmx 
+tools/coqdep.cmo: config/coq_config.cmi tools/coqdep_lexer.cmo 
+tools/coqdep.cmx: config/coq_config.cmx tools/coqdep_lexer.cmx 
 tools/gallina.cmo: tools/gallina_lexer.cmo 
 tools/gallina.cmx: tools/gallina_lexer.cmx 
 toplevel/class.cmo: pretyping/classops.cmi kernel/declarations.cmi \
@@ -1195,24 +1192,16 @@ toplevel/recordobj.cmx: pretyping/classops.cmx library/declare.cmx \
     kernel/evd.cmx library/global.cmx kernel/instantiate.cmx library/lib.cmx \
     kernel/names.cmx lib/pp.cmx parsing/printer.cmx pretyping/recordops.cmx \
     kernel/term.cmx lib/util.cmx toplevel/recordobj.cmi 
-toplevel/toplevel.cmo: parsing/ast.cmi toplevel/errors.cmi toplevel/mltop.cmi \
-    kernel/names.cmi lib/options.cmi parsing/pcoq.cmi proofs/pfedit.cmi \
-    lib/pp.cmi toplevel/protectedtoplevel.cmi lib/util.cmi \
+toplevel/toplevel.cmo: parsing/ast.cmi toplevel/errors.cmi library/lib.cmi \
+    toplevel/mltop.cmi kernel/names.cmi lib/options.cmi parsing/pcoq.cmi \
+    proofs/pfedit.cmi lib/pp.cmi toplevel/protectedtoplevel.cmi lib/util.cmi \
     toplevel/vernac.cmi toplevel/vernacinterp.cmi toplevel/toplevel.cmi 
-toplevel/toplevel.cmx: parsing/ast.cmx toplevel/errors.cmx toplevel/mltop.cmx \
-    kernel/names.cmx lib/options.cmx parsing/pcoq.cmx proofs/pfedit.cmx \
-    lib/pp.cmx toplevel/protectedtoplevel.cmx lib/util.cmx \
+toplevel/toplevel.cmx: parsing/ast.cmx toplevel/errors.cmx library/lib.cmx \
+    toplevel/mltop.cmx kernel/names.cmx lib/options.cmx parsing/pcoq.cmx \
+    proofs/pfedit.cmx lib/pp.cmx toplevel/protectedtoplevel.cmx lib/util.cmx \
     toplevel/vernac.cmx toplevel/vernacinterp.cmx toplevel/toplevel.cmi 
 toplevel/usage.cmo: config/coq_config.cmi toplevel/usage.cmi 
 toplevel/usage.cmx: config/coq_config.cmx toplevel/usage.cmi 
-toplevel/vernac.cmo: parsing/ast.cmi parsing/coqast.cmi \
-    toplevel/discharge.cmi library/library.cmi lib/options.cmi \
-    parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmi library/states.cmi \
-    lib/system.cmi lib/util.cmi toplevel/vernacinterp.cmi toplevel/vernac.cmi 
-toplevel/vernac.cmx: parsing/ast.cmx parsing/coqast.cmx \
-    toplevel/discharge.cmx library/library.cmx lib/options.cmx \
-    parsing/pcoq.cmx proofs/pfedit.cmx lib/pp.cmx library/states.cmx \
-    lib/system.cmx lib/util.cmx toplevel/vernacinterp.cmx toplevel/vernac.cmi 
 toplevel/vernacentries.cmo: parsing/ast.cmi parsing/astterm.cmi \
     toplevel/class.cmi pretyping/classops.cmi toplevel/command.cmi \
     parsing/coqast.cmi kernel/declarations.cmi library/declare.cmi \
@@ -1257,26 +1246,34 @@ toplevel/vernacinterp.cmx: parsing/ast.cmx parsing/astterm.cmx \
     kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
     pretyping/pretype_errors.cmx proofs/proof_type.cmx proofs/tacinterp.cmx \
     lib/util.cmx toplevel/vernacinterp.cmi 
+toplevel/vernac.cmo: parsing/ast.cmi parsing/coqast.cmi \
+    toplevel/discharge.cmi library/library.cmi lib/options.cmi \
+    parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmi library/states.cmi \
+    lib/system.cmi lib/util.cmi toplevel/vernacinterp.cmi toplevel/vernac.cmi 
+toplevel/vernac.cmx: parsing/ast.cmx parsing/coqast.cmx \
+    toplevel/discharge.cmx library/library.cmx lib/options.cmx \
+    parsing/pcoq.cmx proofs/pfedit.cmx lib/pp.cmx library/states.cmx \
+    lib/system.cmx lib/util.cmx toplevel/vernacinterp.cmx toplevel/vernac.cmi 
 contrib/extraction/extraction.cmo: contrib/extraction/miniml.cmi \
     kernel/names.cmi kernel/term.cmi contrib/extraction/extraction.cmi 
 contrib/extraction/extraction.cmx: contrib/extraction/miniml.cmi \
     kernel/names.cmx kernel/term.cmx contrib/extraction/extraction.cmi 
 contrib/omega/coq_omega.cmo: parsing/ast.cmi proofs/clenv.cmi \
-    kernel/closure.cmi library/declare.cmi kernel/environ.cmi \
-    tactics/equality.cmi kernel/evd.cmi library/global.cmi \
+    kernel/closure.cmi parsing/coqlib.cmi library/declare.cmi \
+    kernel/environ.cmi tactics/equality.cmi kernel/evd.cmi library/global.cmi \
     kernel/inductive.cmi proofs/logic.cmi kernel/names.cmi \
-    contrib/omega/omega.cmo lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_type.cmi kernel/reduction.cmi pretyping/retyping.cmi \
-    kernel/sign.cmi proofs/tacmach.cmi tactics/tactics.cmi kernel/term.cmi \
-    lib/util.cmi 
+    library/nametab.cmi contrib/omega/omega.cmo lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_type.cmi kernel/reduction.cmi \
+    pretyping/retyping.cmi kernel/sign.cmi proofs/tacmach.cmi \
+    tactics/tactics.cmi kernel/term.cmi lib/util.cmi 
 contrib/omega/coq_omega.cmx: parsing/ast.cmx proofs/clenv.cmx \
-    kernel/closure.cmx library/declare.cmx kernel/environ.cmx \
-    tactics/equality.cmx kernel/evd.cmx library/global.cmx \
+    kernel/closure.cmx parsing/coqlib.cmx library/declare.cmx \
+    kernel/environ.cmx tactics/equality.cmx kernel/evd.cmx library/global.cmx \
     kernel/inductive.cmx proofs/logic.cmx kernel/names.cmx \
-    contrib/omega/omega.cmx lib/pp.cmx parsing/printer.cmx \
-    proofs/proof_type.cmx kernel/reduction.cmx pretyping/retyping.cmx \
-    kernel/sign.cmx proofs/tacmach.cmx tactics/tactics.cmx kernel/term.cmx \
-    lib/util.cmx 
+    library/nametab.cmx contrib/omega/omega.cmx lib/pp.cmx \
+    parsing/printer.cmx proofs/proof_type.cmx kernel/reduction.cmx \
+    pretyping/retyping.cmx kernel/sign.cmx proofs/tacmach.cmx \
+    tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
 contrib/omega/omega.cmo: lib/util.cmi 
 contrib/omega/omega.cmx: lib/util.cmx 
 contrib/ring/quote.cmo: library/declare.cmi library/global.cmi \
@@ -1288,25 +1285,23 @@ contrib/ring/quote.cmx: library/declare.cmx library/global.cmx \
     proofs/proof_trees.cmx proofs/proof_type.cmx proofs/tacmach.cmx \
     tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
 contrib/ring/ring.cmo: parsing/astterm.cmi kernel/closure.cmi \
-    library/declare.cmi tactics/equality.cmi kernel/evd.cmi \
-    library/global.cmi tactics/hiddentac.cmi tactics/hipattern.cmi \
-    library/lib.cmi library/libobject.cmi kernel/names.cmi \
-    pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
+    parsing/coqlib.cmi library/declare.cmi tactics/equality.cmi \
+    kernel/evd.cmi library/global.cmi tactics/hiddentac.cmi \
+    tactics/hipattern.cmi library/lib.cmi library/libobject.cmi \
+    kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
     proofs/proof_trees.cmi proofs/proof_type.cmi contrib/ring/quote.cmo \
     kernel/reduction.cmi library/summary.cmi proofs/tacmach.cmi \
     pretyping/tacred.cmi tactics/tactics.cmi kernel/term.cmi \
     pretyping/typing.cmi lib/util.cmi toplevel/vernacinterp.cmi 
 contrib/ring/ring.cmx: parsing/astterm.cmx kernel/closure.cmx \
-    library/declare.cmx tactics/equality.cmx kernel/evd.cmx \
-    library/global.cmx tactics/hiddentac.cmx tactics/hipattern.cmx \
-    library/lib.cmx library/libobject.cmx kernel/names.cmx \
-    pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
+    parsing/coqlib.cmx library/declare.cmx tactics/equality.cmx \
+    kernel/evd.cmx library/global.cmx tactics/hiddentac.cmx \
+    tactics/hipattern.cmx library/lib.cmx library/libobject.cmx \
+    kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
     proofs/proof_trees.cmx proofs/proof_type.cmx contrib/ring/quote.cmx \
     kernel/reduction.cmx library/summary.cmx proofs/tacmach.cmx \
     pretyping/tacred.cmx tactics/tactics.cmx kernel/term.cmx \
     pretyping/typing.cmx lib/util.cmx toplevel/vernacinterp.cmx 
-contrib/xml/xml.cmo: contrib/xml/xml.cmi 
-contrib/xml/xml.cmx: contrib/xml/xml.cmi 
 contrib/xml/xmlcommand.cmo: kernel/declarations.cmi library/declare.cmi \
     kernel/environ.cmi kernel/evd.cmi library/global.cmi library/lib.cmi \
     library/libobject.cmi library/library.cmi kernel/names.cmi \
@@ -1325,6 +1320,8 @@ contrib/xml/xmlentries.cmo: lib/util.cmi toplevel/vernacinterp.cmi \
     contrib/xml/xmlcommand.cmi 
 contrib/xml/xmlentries.cmx: lib/util.cmx toplevel/vernacinterp.cmx \
     contrib/xml/xmlcommand.cmx 
+contrib/xml/xml.cmo: contrib/xml/xml.cmi 
+contrib/xml/xml.cmx: contrib/xml/xml.cmi 
 tactics/tauto.cmo: parsing/grammar.cma kernel/names.cmo parsing/ast.cmo parsing/g_tactic.cmo parsing/g_constr.cmo
 parsing/lexer.cmo: 
 parsing/q_coqast.cmo: