diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-12-27 14:41:49 +0000 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2014-12-27 14:41:49 +0000 |
| commit | 7ca29ef3f7ada4eefae4f6c58e77c92e6587ce69 (patch) | |
| tree | e3656320266b1d090e1fed75c498980330768400 /tools/.depend | |
| parent | 65758c08dde5a5e5e379669f82a891f8e7699132 (diff) | |
| download | ocaml-7ca29ef3f7ada4eefae4f6c58e77c92e6587ce69.tar.gz | |
PR#5887: move the byterun/*.h headers to byterun/caml/*.h to avoid header name clashes
(Jérôme Vouillon and Adrien Nader and Peter Zotov)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15757 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools/.depend')
| -rw-r--r-- | tools/.depend | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/.depend b/tools/.depend index c33f5c6f22..ed77b25945 100644 --- a/tools/.depend +++ b/tools/.depend @@ -1,6 +1,5 @@ depend.cmi : ../parsing/parsetree.cmi ../parsing/longident.cmi profiling.cmi : -tast_iter.cmi : ../typing/typedtree.cmi ../parsing/asttypes.cmi untypeast.cmi : ../typing/typedtree.cmi ../typing/path.cmi \ ../parsing/parsetree.cmi ../parsing/longident.cmi addlabels.cmo : ../parsing/parsetree.cmi ../parsing/parse.cmi \ @@ -8,13 +7,13 @@ addlabels.cmo : ../parsing/parsetree.cmi ../parsing/parse.cmi \ addlabels.cmx : ../parsing/parsetree.cmi ../parsing/parse.cmx \ ../parsing/longident.cmx ../parsing/location.cmx ../parsing/asttypes.cmi cmt2annot.cmo : untypeast.cmi ../typing/types.cmi ../typing/typedtree.cmi \ - tast_iter.cmi ../typing/stypes.cmi ../parsing/pprintast.cmi \ + ../typing/tast_mapper.cmi ../typing/stypes.cmi ../parsing/pprintast.cmi \ ../typing/path.cmi ../typing/oprint.cmi ../parsing/location.cmi \ ../typing/ident.cmi ../typing/envaux.cmi ../typing/env.cmi \ ../utils/config.cmi ../typing/cmt_format.cmi ../parsing/asttypes.cmi \ ../typing/annot.cmi cmt2annot.cmx : untypeast.cmx ../typing/types.cmx ../typing/typedtree.cmx \ - tast_iter.cmx ../typing/stypes.cmx ../parsing/pprintast.cmx \ + ../typing/tast_mapper.cmx ../typing/stypes.cmx ../parsing/pprintast.cmx \ ../typing/path.cmx ../typing/oprint.cmx ../parsing/location.cmx \ ../typing/ident.cmx ../typing/envaux.cmx ../typing/env.cmx \ ../utils/config.cmx ../typing/cmt_format.cmx ../parsing/asttypes.cmi \ @@ -59,10 +58,10 @@ ocamldep.cmx : ../driver/pparse.cmx ../parsing/parsetree.cmi \ ../parsing/parse.cmx ../utils/misc.cmx ../parsing/longident.cmx \ ../parsing/location.cmx depend.cmx ../utils/config.cmx \ ../driver/compenv.cmx ../utils/clflags.cmx -ocamlmklib.cmo : ocamlmklibconfig.cmo -ocamlmklib.cmx : ocamlmklibconfig.cmx ocamlmklibconfig.cmo : ocamlmklibconfig.cmx : +ocamlmklib.cmo : ocamlmklibconfig.cmo +ocamlmklib.cmx : ocamlmklibconfig.cmx ocamlmktop.cmo : ../utils/ccomp.cmi ocamlmktop.cmx : ../utils/ccomp.cmx ocamloptp.cmo : ../driver/main_args.cmi @@ -81,8 +80,6 @@ read_cmt.cmo : ../typing/cmt_format.cmi cmt2annot.cmo ../utils/clflags.cmi read_cmt.cmx : ../typing/cmt_format.cmx cmt2annot.cmx ../utils/clflags.cmx scrapelabels.cmo : scrapelabels.cmx : -tast_iter.cmo : ../typing/typedtree.cmi ../utils/misc.cmi tast_iter.cmi -tast_iter.cmx : ../typing/typedtree.cmx ../utils/misc.cmx tast_iter.cmi untypeast.cmo : ../typing/typedtree.cmi ../typing/path.cmi \ ../parsing/parsetree.cmi ../utils/misc.cmi ../parsing/longident.cmi \ ../typing/ident.cmi ../parsing/asttypes.cmi ../parsing/ast_helper.cmi \ |