summaryrefslogtreecommitdiff
path: root/ocamlbuild/ocaml_utils.ml
diff options
context:
space:
mode:
authorNicolas Pouillard <np@nicolaspouillard.fr>2007-02-08 16:53:39 +0000
committerNicolas Pouillard <np@nicolaspouillard.fr>2007-02-08 16:53:39 +0000
commit0368536e726f86e541491be1a597659e7ef20c73 (patch)
tree134011b5bfb8b4b2be9089c2cdc2bfee9cb512ca /ocamlbuild/ocaml_utils.ml
parent3a67908c91ae690598e5dc28577783af6bba4843 (diff)
downloadocaml-0368536e726f86e541491be1a597659e7ef20c73.tar.gz
[ocamlbuild] some changes see ocamlbuild/ChangeLog
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7842 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamlbuild/ocaml_utils.ml')
-rw-r--r--ocamlbuild/ocaml_utils.ml15
1 files changed, 7 insertions, 8 deletions
diff --git a/ocamlbuild/ocaml_utils.ml b/ocamlbuild/ocaml_utils.ml
index f669b3e50e..84f890db38 100644
--- a/ocamlbuild/ocaml_utils.ml
+++ b/ocamlbuild/ocaml_utils.ml
@@ -42,14 +42,13 @@ let ignore_stdlib x =
let non_dependencies = ref []
let non_dependency m1 m2 = non_dependencies := (m1, m2) :: !non_dependencies
-let ignore_this_module modpath x =
- List.mem (modpath, x) !non_dependencies
- || (List.mem x !Options.ignore_list) || ignore_stdlib x
-
-let keep_this_module modpath x =
- if ignore_this_module modpath x then
- let () = dprintf 3 "This module (%s) is ignored by %s" x modpath in false
- else true
+let module_importance modpath x =
+ if List.mem (modpath, x) !non_dependencies
+ || (List.mem x !Options.ignore_list) then begin
+ let () = dprintf 3 "This module (%s) is ignored by %s" x modpath in
+ `ignored
+ end
+ else if ignore_stdlib x then `just_try else `mandatory
let expand_module include_dirs module_name exts =
List.fold_right begin fun include_dir ->