diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/.depend | 11 | ||||
| -rw-r--r-- | tools/Makefile.shared | 4 | ||||
| -rw-r--r-- | tools/objinfo_helper.c | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/tools/.depend b/tools/.depend index c33f5c6f2..ed77b2594 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 \ diff --git a/tools/Makefile.shared b/tools/Makefile.shared index 9aedd2333..302e14705 100644 --- a/tools/Makefile.shared +++ b/tools/Makefile.shared @@ -253,7 +253,7 @@ dumpobj: $(DUMPOBJ) clean:: rm -f dumpobj -opnames.ml: ../byterun/instruct.h +opnames.ml: ../byterun/caml/instruct.h unset LC_ALL || : ; \ unset LC_CTYPE || : ; \ unset LC_COLLATE LANG || : ; \ @@ -263,7 +263,7 @@ opnames.ml: ../byterun/instruct.h -e 's/.*};$$/ |]/' \ -e 's/\([A-Z][A-Z_0-9a-z]*\)/"\1"/g' \ -e 's/,/;/g' \ - ../byterun/instruct.h > opnames.ml + ../byterun/caml/instruct.h > opnames.ml clean:: rm -f opnames.ml diff --git a/tools/objinfo_helper.c b/tools/objinfo_helper.c index a8c79bd39..74cfc2ebd 100644 --- a/tools/objinfo_helper.c +++ b/tools/objinfo_helper.c @@ -10,8 +10,8 @@ /***********************************************************************/ #include "../config/s.h" -#include "../byterun/mlvalues.h" -#include "../byterun/alloc.h" +#include "../byterun/caml/mlvalues.h" +#include "../byterun/caml/alloc.h" #include <stdio.h> #ifdef HAS_LIBBFD |