Merge branch 'v8.5'

1 files changed, 4 insertions, 2 deletions

diff --git a/tools/coqdep_common.mli b/tools/coqdep_common.mli
index dcd69ebdb..c3570f811 100644
--- a/tools/coqdep_common.mli
+++ b/tools/coqdep_common.mli
@@ -6,12 +6,14 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
+module StrSet : Set.S with type elt = string
+
 val option_c : bool ref
 val option_noglob : bool ref
 val option_boot : bool ref
 val option_natdynlk : bool ref
 val option_mldep : string option ref
-val norec_dirs : string list ref
+val norec_dirs : StrSet.t ref
 val suffixe : string ref
 type dir = string option
 val get_extension : string -> string list -> string * string
@@ -30,7 +32,6 @@ val search_mli_known : string -> dir option
 val add_mllib_known : string -> dir -> string -> unit
 val search_mllib_known : string -> dir option
 val search_v_known : ?from:string list -> string list -> string option
-val coqlibKnown : (string list, unit) Hashtbl.t
 val file_name : string -> string option -> string
 val escape : string -> string
 val canonize : string -> string
@@ -38,6 +39,7 @@ val mL_dependencies : unit -> unit
 val coq_dependencies : unit -> unit
 val suffixes : 'a list -> 'a list list
 val add_known : bool -> string -> string list -> string -> unit
+val add_coqlib_known : bool -> string -> string list -> string -> unit
 val add_caml_known : string -> string list -> string -> unit
 val add_caml_dir : string -> unit
 val add_dir :