merge trunk:14244 to fix bootstrap

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/module-alias@14245 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

5 files changed, 15 insertions, 116 deletions

diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
index a0004a1ed2..36fbd82de9 100644
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
@@ -137,62 +137,12 @@ LIBCMXFILES= $(LIBCMOFILES:.cmo=.cmx)
 LIBCMIFILES= $(LIBCMOFILES:.cmo=.cmi)
 
 # Les cmo et cmx de la distrib OCAML
-OCAMLCMOFILES=$(OCAMLSRCDIR)/parsing/printast.cmo \
-	$(OCAMLSRCDIR)/typing/ident.cmo \
-	$(OCAMLSRCDIR)/utils/tbl.cmo \
-	$(OCAMLSRCDIR)/utils/misc.cmo \
-	$(OCAMLSRCDIR)/utils/config.cmo \
-	$(OCAMLSRCDIR)/utils/clflags.cmo \
-	$(OCAMLSRCDIR)/utils/warnings.cmo \
-	$(OCAMLSRCDIR)/utils/ccomp.cmo \
-	$(OCAMLSRCDIR)/utils/consistbl.cmo \
-	$(OCAMLSRCDIR)/parsing/location.cmo\
-	$(OCAMLSRCDIR)/parsing/longident.cmo \
-	$(OCAMLSRCDIR)/parsing/syntaxerr.cmo \
-	$(OCAMLSRCDIR)/parsing/ast_helper.cmo \
-	$(OCAMLSRCDIR)/parsing/parser.cmo \
-	$(OCAMLSRCDIR)/parsing/lexer.cmo \
-	$(OCAMLSRCDIR)/parsing/parse.cmo \
-	$(OCAMLSRCDIR)/parsing/ast_mapper.cmo \
-	$(OCAMLSRCDIR)/typing/types.cmo \
-	$(OCAMLSRCDIR)/typing/path.cmo \
-	$(OCAMLSRCDIR)/typing/btype.cmo \
-	$(OCAMLSRCDIR)/typing/predef.cmo \
-	$(OCAMLSRCDIR)/typing/datarepr.cmo \
-	$(OCAMLSRCDIR)/typing/subst.cmo \
-	$(OCAMLSRCDIR)/typing/cmi_format.cmo \
-	$(OCAMLSRCDIR)/typing/env.cmo \
-	$(OCAMLSRCDIR)/typing/ctype.cmo \
-	$(OCAMLSRCDIR)/typing/primitive.cmo \
-	$(OCAMLSRCDIR)/typing/oprint.cmo \
-	$(OCAMLSRCDIR)/typing/printtyp.cmo \
-	$(OCAMLSRCDIR)/typing/includecore.cmo \
-	$(OCAMLSRCDIR)/typing/typedtree.cmo \
-	$(OCAMLSRCDIR)/typing/typetexp.cmo \
-	$(OCAMLSRCDIR)/typing/parmatch.cmo \
-	$(OCAMLSRCDIR)/typing/stypes.cmo \
-	$(OCAMLSRCDIR)/typing/typedtreeMap.cmo \
-	$(OCAMLSRCDIR)/typing/cmt_format.cmo \
-	$(OCAMLSRCDIR)/typing/typecore.cmo \
-	$(OCAMLSRCDIR)/typing/includeclass.cmo \
-	$(OCAMLSRCDIR)/typing/typedecl.cmo \
-	$(OCAMLSRCDIR)/typing/typeclass.cmo \
-	$(OCAMLSRCDIR)/typing/mtype.cmo \
-	$(OCAMLSRCDIR)/typing/includemod.cmo \
-	$(OCAMLSRCDIR)/typing/typemod.cmo \
-	$(OCAMLSRCDIR)/bytecomp/lambda.cmo \
-	$(OCAMLSRCDIR)/bytecomp/typeopt.cmo \
-	$(OCAMLSRCDIR)/bytecomp/printlambda.cmo \
-	$(OCAMLSRCDIR)/bytecomp/switch.cmo \
-	$(OCAMLSRCDIR)/bytecomp/matching.cmo \
-	$(OCAMLSRCDIR)/bytecomp/translobj.cmo \
-	$(OCAMLSRCDIR)/bytecomp/translcore.cmo \
-	$(OCAMLSRCDIR)/bytecomp/translclass.cmo \
-	$(OCAMLSRCDIR)/tools/depend.cmo \
-	$(OCAMLSRCDIR)/driver/pparse.cmo
+OCAMLCMOFILES= \
+	$(OCAMLSRCDIR)/tools/depend.cmo
 
 OCAMLCMXFILES=$(OCAMLCMOFILES:.cmo=.cmx)
 
+
 STDLIB_MLIS=../stdlib/*.mli \
 	../otherlibs/$(UNIXLIB)/unix.mli \
 	../otherlibs/str/str.mli \
@@ -218,9 +168,9 @@ debug:
 	$(MAKE) OCAMLPP=""
 
 $(OCAMLDOC): $(EXECMOFILES)
-	$(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES)
+	$(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(OCAMLSRCDIR)/compilerlibs/ocamlcommon.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES)
 $(OCAMLDOC_OPT): $(EXECMXFILES)
-	$(OCAMLOPT) -o $@ -linkall unix.cmxa str.cmxa dynlink.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)
+	$(OCAMLOPT) -o $@ -linkall unix.cmxa str.cmxa dynlink.cmxa $(OCAMLSRCDIR)/compilerlibs/ocamlcommon.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)
 
 $(OCAMLDOC_LIBCMA): $(LIBCMOFILES)
 	$(OCAMLC) -a -o $@ $(LINKFLAGS) $(OCAMLSRCDIR)/tools/depend.cmo $(LIBCMOFILES)
diff --git a/ocamldoc/Makefile.nt b/ocamldoc/Makefile.nt
index e03bb6b196..328a37489c 100644
--- a/ocamldoc/Makefile.nt
+++ b/ocamldoc/Makefile.nt
@@ -127,59 +127,8 @@ LIBCMXFILES= $(LIBCMOFILES:.cmo=.cmx)
 LIBCMIFILES= $(LIBCMOFILES:.cmo=.cmi)
 
 # Les cmo et cmx de la distrib OCAML
-OCAMLCMOFILES=$(OCAMLSRCDIR)/parsing/printast.cmo \
-	$(OCAMLSRCDIR)/typing/ident.cmo \
-	$(OCAMLSRCDIR)/utils/tbl.cmo \
-	$(OCAMLSRCDIR)/utils/misc.cmo \
-	$(OCAMLSRCDIR)/utils/config.cmo \
-	$(OCAMLSRCDIR)/utils/clflags.cmo \
-	$(OCAMLSRCDIR)/utils/warnings.cmo \
-	$(OCAMLSRCDIR)/utils/ccomp.cmo \
-	$(OCAMLSRCDIR)/utils/consistbl.cmo \
-	$(OCAMLSRCDIR)/parsing/location.cmo\
-	$(OCAMLSRCDIR)/parsing/longident.cmo \
-	$(OCAMLSRCDIR)/parsing/syntaxerr.cmo \
-	$(OCAMLSRCDIR)/parsing/ast_helper.cmo \
-	$(OCAMLSRCDIR)/parsing/parser.cmo \
-	$(OCAMLSRCDIR)/parsing/lexer.cmo \
-	$(OCAMLSRCDIR)/parsing/parse.cmo \
-	$(OCAMLSRCDIR)/parsing/ast_mapper.cmo \
-	$(OCAMLSRCDIR)/typing/types.cmo \
-	$(OCAMLSRCDIR)/typing/path.cmo \
-	$(OCAMLSRCDIR)/typing/btype.cmo \
-	$(OCAMLSRCDIR)/typing/predef.cmo \
-	$(OCAMLSRCDIR)/typing/datarepr.cmo \
-	$(OCAMLSRCDIR)/typing/subst.cmo \
-	$(OCAMLSRCDIR)/typing/cmi_format.cmo \
-	$(OCAMLSRCDIR)/typing/env.cmo \
-	$(OCAMLSRCDIR)/typing/ctype.cmo \
-	$(OCAMLSRCDIR)/typing/primitive.cmo \
-	$(OCAMLSRCDIR)/typing/oprint.cmo \
-	$(OCAMLSRCDIR)/typing/printtyp.cmo \
-	$(OCAMLSRCDIR)/typing/includecore.cmo \
-	$(OCAMLSRCDIR)/typing/typedtree.cmo \
-	$(OCAMLSRCDIR)/typing/typetexp.cmo \
-	$(OCAMLSRCDIR)/typing/parmatch.cmo \
-	$(OCAMLSRCDIR)/typing/stypes.cmo \
-	$(OCAMLSRCDIR)/typing/typedtreeMap.cmo \
-	$(OCAMLSRCDIR)/typing/cmt_format.cmo \
-	$(OCAMLSRCDIR)/typing/typecore.cmo \
-	$(OCAMLSRCDIR)/typing/includeclass.cmo \
-	$(OCAMLSRCDIR)/typing/typedecl.cmo \
-	$(OCAMLSRCDIR)/typing/typeclass.cmo \
-	$(OCAMLSRCDIR)/typing/mtype.cmo \
-	$(OCAMLSRCDIR)/typing/includemod.cmo \
-	$(OCAMLSRCDIR)/typing/typemod.cmo \
-	$(OCAMLSRCDIR)/bytecomp/lambda.cmo \
-	$(OCAMLSRCDIR)/bytecomp/typeopt.cmo \
-	$(OCAMLSRCDIR)/bytecomp/printlambda.cmo \
-	$(OCAMLSRCDIR)/bytecomp/switch.cmo \
-	$(OCAMLSRCDIR)/bytecomp/matching.cmo \
-	$(OCAMLSRCDIR)/bytecomp/translobj.cmo \
-	$(OCAMLSRCDIR)/bytecomp/translcore.cmo \
-	$(OCAMLSRCDIR)/bytecomp/translclass.cmo \
-	$(OCAMLSRCDIR)/tools/depend.cmo \
-	$(OCAMLSRCDIR)/driver/pparse.cmo
+OCAMLCMOFILES= \
+	$(OCAMLSRCDIR)/tools/depend.cmo
 
 OCAMLCMXFILES=$(OCAMLCMOFILES:.cmo=.cmx)
 
@@ -194,9 +143,9 @@ debug:
 	$(MAKE) OCAMLPP=""
 
 $(OCAMLDOC): $(EXECMOFILES)
-	$(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES)
+	$(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(OCAMLSRCDIR)/compilerlibs/ocamlcommon.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES)
 $(OCAMLDOC_OPT): $(EXECMXFILES)
-	$(OCAMLOPT) -o $@ unix.cmxa str.cmxa dynlink.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)
+	$(OCAMLOPT) -o $@ unix.cmxa str.cmxa dynlink.cmxa $(OCAMLSRCDIR)/compilerlibs/ocamlcommon.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)
 
 $(OCAMLDOC_LIBCMA): $(LIBCMOFILES)
 	$(OCAMLC) -a -o $@ $(LINKFLAGS) $(OCAMLCMOFILES) $(LIBCMOFILES)
diff --git a/ocamldoc/odoc_ast.ml b/ocamldoc/odoc_ast.ml
index dd106b4f04..6f0a8d572b 100644
--- a/ocamldoc/odoc_ast.ml
+++ b/ocamldoc/odoc_ast.ml
@@ -955,7 +955,7 @@ module Analyser =
               | _ -> false)
         | Element_module_type mt ->
             (function
-                Types.Sig_modtype (ident,Types.Modtype_manifest t) ->
+                Types.Sig_modtype (ident,{Types.mtd_type=Some t}) ->
                   let n1 = Name.simple mt.mt_name
                   and n2 = Ident.name ident in
                   (
diff --git a/ocamldoc/odoc_env.ml b/ocamldoc/odoc_env.ml
index 79eeca8c95..0348b54759 100644
--- a/ocamldoc/odoc_env.ml
+++ b/ocamldoc/odoc_env.ml
@@ -62,10 +62,10 @@ let rec add_signature env root ?rel signat =
         { env2 with env_modules = (rel_name ident, qualify ident) :: env2.env_modules }
     | Types.Sig_modtype (ident, modtype_decl) ->
         let env2 =
-          match modtype_decl with
-            Types.Modtype_abstract ->
+          match modtype_decl.Types.mtd_type with
+            None ->
               env
-          | Types.Modtype_manifest modtype ->
+          | Some modtype ->
               match modtype with
                  (* A VOIR : le cas ou c'est un identificateur, dans ce cas on n'a pas de signature *)
                 Types.Mty_signature s -> add_signature env (qualify ident) ~rel: (rel_name ident) s
diff --git a/ocamldoc/odoc_sig.ml b/ocamldoc/odoc_sig.ml
index 21a0394c8a..c2c0a9187e 100644
--- a/ocamldoc/odoc_sig.ml
+++ b/ocamldoc/odoc_sig.ml
@@ -99,9 +99,9 @@ module Signature_search =
 
     let search_module_type table name =
       match Hashtbl.find table (MT name) with
-      | (Types.Sig_modtype (_, Types.Modtype_manifest module_type)) ->
+      | (Types.Sig_modtype (_, {Types.mtd_type = Some module_type})) ->
           Some module_type
-      | (Types.Sig_modtype (_, Types.Modtype_abstract)) ->
+      | (Types.Sig_modtype (_, {Types.mtd_type = None})) ->
           None
       | _ -> assert false