Merge branch 'v8.5'

1 files changed, 22 insertions, 6 deletions

diff --git a/tools/coqdep.ml b/tools/coqdep.ml
index 0634f97fa..13705edaa 100644
--- a/tools/coqdep.ml
+++ b/tools/coqdep.ml
@@ -1,6 +1,6 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2016     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
@@ -427,12 +427,28 @@ let coq_dependencies_dump chan dumpboxes =
 end
 
 let usage () =
-  eprintf " usage: coqdep [-w] [-c] [-D] [-I dir] [-Q dir coqdir] [-R dir coqdir] <filename>+\n";
-  eprintf " extra options:\n";
-  eprintf "  -sort : output the file names ordered by dependencies\n";
-  eprintf "  -coqlib dir : set the coq standard library directory\n";
-  eprintf "  -exclude-dir f : skip subdirectories named 'f' during -R search\n";
+  eprintf " usage: coqdep [options] <filename>+\n";
+  eprintf " options:\n";
+  eprintf "  -c : Also print the dependencies of caml modules (=ocamldep).\n";
+  (* Does not work anymore  *)
+  (* eprintf " -w : Print informations on missing or wrong \"Declare
+     ML Module\" commands in coq files.\n";  *)
+  (* Does not work anymore: *)
+  (* eprintf " -D : Prints the missing ocmal module names. No dependency computed.\n"; *)
+  eprintf "  -boot : For coq developpers, prints dependencies over coq library files (omitted by default).\n";
+  eprintf "  -sort : output the given file name ordered by dependencies\n";
+  eprintf "  -noglob | -no-glob : \n";
+  eprintf "  -I dir -as logname : add (non recursively) dir to coq load path under logical name logname\n";
+  eprintf "  -I dir : add (non recursively) dir to ocaml path\n";
+  eprintf "  -R dir -as logname : add and import dir recursively to coq load path under logical name logname\n"; (* deprecate? *)
+  eprintf "  -R dir logname : add and import dir recursively to coq load path under logical name logname\n";
+  eprintf "  -Q dir logname : add (recusively) and open (non recursively) dir to coq load path under logical name logname\n";
   eprintf "  -dumpgraph f : print a dot dependency graph in file 'f'\n";
+  eprintf "  -dumpgraphbox f : print a dot dependency graph box in file 'f'\n";
+  eprintf "  -exclude-dir dir : skip subdirectories named 'dir' during -R/-Q search\n";
+  eprintf "  -coqlib dir : set the coq standard library directory\n";
+  eprintf "  -suffix s : \n";
+  eprintf "  -slash : deprecated, no effect\n";
   exit 1
 
 let split_period = Str.split (Str.regexp (Str.quote "."))