Blob Blame History Raw
From cd2d3363bad49884e384f7a01753c19de7af89a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20Nguy=E1=BB=85n?= <kn@lri.fr>
Date: Sat, 2 Aug 2014 15:13:24 +0200
Subject: [PATCH 02/11] Do not rely on a #load directive at the top of
 parser/parser.ml to load a camlp4 extension.

---
 Makefile.distrib | 4 ++++
 parser/parser.ml | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.distrib b/Makefile.distrib
index ace8008..152f228 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -309,6 +309,10 @@ misc/q_symbol.cmo: misc/q_symbol.ml
 	@echo "Build $@"		  
 	$(HIDE)$(CAMLC) -c -pp camlp4orf $<
 
+parser/parser.cmo: PACKAGES += camlp4.extend
+parser/parser.cmx: PACKAGES += camlp4.extend
+
+
 .ml.cmo:
 	@echo "Build $@"
 	$(HIDE)$(CAMLC) -c $(INCLUDES) $(SYNTAX_PARSER) $<
diff --git a/parser/parser.ml b/parser/parser.ml
index 8f805da..2a2763a 100644
--- a/parser/parser.ml
+++ b/parser/parser.ml
@@ -1,5 +1,3 @@
-#load "pa_extend.cmo";;
-
 open Cduce_loc
 (* let raise = Pervasives.raise *)
 open Ast
-- 
1.9.3