Makefile: compat5* moved in grammar/, less -I given to camlp4o

4 files changed, 3 insertions, 62 deletions

diff --git a/tools/compat5.ml b/tools/compat5.ml
deleted file mode 100644
index 33c1cd602..000000000
--- a/tools/compat5.ml
+++ /dev/null
@@ -1,13 +0,0 @@
-(************************************************************************)
-(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2016     *)
-(*   \VV/  **************************************************************)
-(*    //   *      This file is distributed under the terms of the       *)
-(*         *       GNU Lesser General Public License Version 2.1        *)
-(************************************************************************)
-
-(* This file is meant for camlp5, for which there is nothing to
-   add to gain camlp5 compatibility :-).
-
-   See [compat5.mlp] for the [camlp4] counterpart
-*)
diff --git a/tools/compat5.mlp b/tools/compat5.mlp
deleted file mode 100644
index 8473a1fb7..000000000
--- a/tools/compat5.mlp
+++ /dev/null
@@ -1,23 +0,0 @@
-(************************************************************************)
-(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2016     *)
-(*   \VV/  **************************************************************)
-(*    //   *      This file is distributed under the terms of the       *)
-(*         *       GNU Lesser General Public License Version 2.1        *)
-(************************************************************************)
-
-(** Adding a bit of camlp5 syntax to camlp4 for compatibility:
-    - GEXTEND ... becomes EXTEND ...
-*)
-
-open Camlp4.PreCast
-
-let rec my_token_filter = parser
-  | [< '(KEYWORD "GEXTEND", loc); s >] ->
-    [< '(KEYWORD "EXTEND", loc); my_token_filter s >]
-  | [< 'tokloc; s >] -> [< 'tokloc; my_token_filter s >]
-  | [< >] -> [< >]
-
-let _ =
-  Token.Filter.define_filter (Gram.get_filter())
-    (fun prev strm -> prev (my_token_filter strm))
diff --git a/tools/compat5b.mlp b/tools/compat5b.mlp
deleted file mode 100644
index 46802a825..000000000
--- a/tools/compat5b.mlp
+++ /dev/null
@@ -1,23 +0,0 @@
-(************************************************************************)
-(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2016     *)
-(*   \VV/  **************************************************************)
-(*    //   *      This file is distributed under the terms of the       *)
-(*         *       GNU Lesser General Public License Version 2.1        *)
-(************************************************************************)
-
-(** Adding a bit of camlp5 syntax to camlp4 for compatibility:
-    - EXTEND ... becomes EXTEND Gram ...
-*)
-
-open Camlp4.PreCast
-
-let rec my_token_filter = parser
-  | [< '(KEYWORD "EXTEND",_ as t); s >] ->
-    [< 't; '(UIDENT "Gram", Loc.ghost); my_token_filter s >]
-  | [< 'tokloc; s >] -> [< 'tokloc; my_token_filter s >]
-  | [< >] -> [< >]
-
-let _ =
-  Token.Filter.define_filter (Gram.get_filter())
-    (fun prev strm -> prev (my_token_filter strm))
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index 45e843e60..65b2441f7 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -532,11 +532,11 @@ let variables is_install opt (args,defs) =
     print "CAMLLIB?=$(shell $(OCAMLFIND) printconf stdlib)\n";
     print "GRAMMARS?=grammar.cma\n";
     print "ifeq ($(CAMLP4),camlp5)
-CAMLP4EXTEND=pa_extend.cmo q_MLast.cmo pa_macro.cmo unix.cma threads.cma
+CAMLP4EXTEND=pa_extend.cmo q_MLast.cmo pa_macro.cmo
 else
-CAMLP4EXTEND=threads.cma
+CAMLP4EXTEND=
 endif\n";
-    print "PP?=-pp '$(CAMLP4O) -I $(CAMLLIB) -I $(CAMLLIB)/threads/ $(COQSRCLIBS) compat5.cmo \\
+    print "PP?=-pp '$(CAMLP4O) -I $(CAMLLIB) -I $(COQLIB)/grammar compat5.cmo \\
   $(CAMLP4EXTEND) $(GRAMMARS) $(CAMLP4OPTIONS) -impl'\n\n";
     end;
     match is_install with