From d3e00f00c53a11a573101eab8e19f9888fe1093b Mon Sep 17 00:00:00 2001
From: letouzey
Date: Wed, 19 May 2010 15:29:51 +0000
Subject: 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
---
 _tags                                    |  8 ++++----
 myocamlbuild.ml                          | 15 +++++++--------
 plugins/_tags                            |  1 +
 plugins/decl_mode/decl_mode_plugin.mllib |  1 -
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/_tags b/_tags
index 32f57c706d..3d9267a98e 100644
--- a/_tags
+++ b/_tags
@@ -1,14 +1,14 @@
 
 ## tags for binaries
 
-<scripts/coqmktop.{native,byte}> : use_str, use_unix, use_gramlib
-<scripts/coqc.{native,byte}> : use_unix, use_gramlib
+<scripts/coqmktop.{native,byte}> : use_str, use_unix, use_dynlink, use_camlp4
+<scripts/coqc.{native,byte}> : use_unix, use_dynlink, use_camlp4
 <tools/coqdep_boot.{native,byte}> : use_unix
-<tools/coqdep.{native,byte}> : use_unix, use_gramlib
+<tools/coqdep.{native,byte}> : use_unix, use_dynlink, use_camlp4
 <tools/coq_tex.{native,byte}> : use_str
 <tools/coq_makefile.{native,byte}> : use_str
 <tools/coqdoc/main.{native,byte}> : use_str
-<checker/main.{native,byte}> : use_str, use_unix, use_gramlib
+<checker/main.{native,byte}> : use_str, use_unix, use_dynlink, use_camlp4
 <plugins/micromega/csdpcert.{native,byte}> : use_nums, use_unix
 
 ## tags for ide
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index acb37d246a..dd9952da8a 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;
diff --git a/plugins/_tags b/plugins/_tags
index d29dde4eed..8cf17e02a8 100644
--- a/plugins/_tags
+++ b/plugins/_tags
@@ -22,6 +22,7 @@
 "decl_mode/g_decl_mode.ml4": use_grammar
 
 "cc": include
+"decl_mode": include
 "extraction": include
 "firstorder": include
 "funind": include
diff --git a/plugins/decl_mode/decl_mode_plugin.mllib b/plugins/decl_mode/decl_mode_plugin.mllib
index dce989bbcd..39342dbd1c 100644
--- a/plugins/decl_mode/decl_mode_plugin.mllib
+++ b/plugins/decl_mode/decl_mode_plugin.mllib
@@ -1,4 +1,3 @@
-Decl_expr
 Decl_mode
 Decl_interp
 Decl_proof_instr
-- 
cgit v1.2.3