From 6ab40218b625f6b337f553af1be8e7ae3cb4b397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20Nguy=E1=BB=85n?= <kn@lri.fr>
Date: Sat, 2 Aug 2014 17:39:12 +0200
Subject: [PATCH 03/11] Fix the compilation of ocaml bindings: - add
clflags.mli to the list of files imported from the ocaml source tree - remove
another use of #load for syntax extension loading.
---
Makefile.distrib | 2 ++
ocamliface/Makefile | 4 +++-
ocamliface/mlstub.ml | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile.distrib b/Makefile.distrib
index 152f228..16039e2 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -362,3 +362,5 @@ ocamliface/caml_cduce.cmx:
@cd ocamliface; \
$(MAKE) caml_cduce.cmx
+ocamliface/mlstub.cmo: SYNTAX += q_MLast.cmo
+ocamliface/mlstub.cmx: SYNTAX += q_MLast.cmo
diff --git a/ocamliface/Makefile b/ocamliface/Makefile
index 838fcc6..0d2e59f 100644
--- a/ocamliface/Makefile
+++ b/ocamliface/Makefile
@@ -43,7 +43,8 @@ clean:
COPY_FILES=\
typing/annot.mli \
utils/misc.ml utils/tbl.ml \
- utils/consistbl.ml utils/warnings.ml utils/terminfo.ml utils/clflags.ml \
+ utils/consistbl.ml utils/warnings.ml utils/terminfo.ml utils/clflags.mli \
+ utils/clflags.ml \
parsing/asttypes.mli parsing/location.mli \
parsing/longident.ml \
typing/outcometree.mli \
@@ -57,6 +58,7 @@ COPY_FILES=\
COMPILE_FILES=\
warnings.ml location.mli asttypes.mli outcometree.mli annot.mli asttypes.ml \
config.ml misc.ml tbl.ml \
+ clflags.mli \
clflags.ml consistbl.ml terminfo.ml \
location.ml longident.ml \
ident.ml path.ml \
diff --git a/ocamliface/mlstub.ml b/ocamliface/mlstub.ml
index 5730857..54c5a84 100644
--- a/ocamliface/mlstub.ml
+++ b/ocamliface/mlstub.ml
@@ -1,4 +1,3 @@
-#load "q_MLast.cmo";;
(* TODO:
- optimizations: generate labels and atoms only once.
- translate record to open record on positive occurence
--
1.9.3