Ocamlbuild: various fix

- transition to camlp4, with no compatibility for ocamlbuild+camlp5
   (error message)
 - fix compilation of decl_mode : a forgotten include, and
   Decl_expr which is a pure .mli shouldn't be mentionned in the .mllib

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13020 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 7 insertions, 8 deletions

diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index acb37d246..dd9952da8 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -72,6 +72,13 @@ let _ = if w32 then begin
   Options.ocamlmklib := A w32ocamlmklib;
 end
 
+let _ =
+  if Coq_config.camlp4 = "camlp5" then begin
+    printf "Camlp5 is not supported by this ocamlbuild plugin\n";
+    printf "Use camlp4, or make, or both\n";
+    exit 1
+  end
+
 let ocaml = A Coq_config.ocaml
 let camlp4o = A Coq_config.camlp4o
 let camlp4incl = S[A"-I"; A Coq_config.camlp4lib]
@@ -270,10 +277,6 @@ let extra_rules () = begin
 	      T(tags_of_pathname ml4 ++ "p4option"); camlp4compat;
 	      A"-o"; Px ml; A"-impl"; P ml4]));
 
-  flag ["p4mod"] (A"pa_macro.cmo");
-  flag ["p4mod"] (A"pa_extend.cmo");
-  flag ["p4mod"] (A"q_MLast.cmo");
-
   flag_and_dep ["p4mod"; "use_grammar"] (P "parsing/grammar.cma");
   flag_and_dep ["p4mod"; "use_constr"] (P "parsing/q_constr.cmo");
 
@@ -305,10 +308,6 @@ let extra_rules () = begin
   flag ["compile"; "ocaml"; "ide"] lablgtkincl;
   flag ["link"; "ocaml"; "ide"] lablgtkincl;
 
-(** Extra libraries *)
-
-  ocaml_lib ~extern:true "gramlib";
-
 (** C code for the VM *)
 
   dep ["compile"; "c"] c_headers;