aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2017-06-15 19:51:06 +0200
committerGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2017-07-27 12:31:46 +0200
commit436abd92a520f13843b102b24b61802c88c7dba7 (patch)
treefdbcd97a49d533249124c89be7523a430bfa1701
parent2a7ba998bf7d2c461fdbd8b710b7124395bafaa2 (diff)
[make] remove compat5 file.
It is empty and not used anymore.
-rw-r--r--Makefile.build2
-rw-r--r--Makefile.common2
-rw-r--r--grammar/compat5.ml13
-rw-r--r--tools/CoqMakefile.in2
4 files changed, 3 insertions, 16 deletions
diff --git a/Makefile.build b/Makefile.build
index e3316df91..54cae2d05 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -237,7 +237,7 @@ endef
# Camlp5 settings
-CAMLP4DEPS:=grammar/compat5.cmo grammar/grammar.cma
+CAMLP4DEPS:=grammar/grammar.cma
CAMLP4USE=pa_extend.cmo q_MLast.cmo pa_macro.cmo -D$(CAMLVERSION)
PR_O := $(if $(READABLE_ML4),pr_o.cmo,pr_dump.cmo)
diff --git a/Makefile.common b/Makefile.common
index 85ecb1a08..afd6164fc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -109,7 +109,7 @@ CORECMA:=lib/clib.cma lib/lib.cma kernel/kernel.cma intf/intf.cma library/librar
TOPLOOPCMA:=stm/proofworkertop.cma stm/tacworkertop.cma stm/queryworkertop.cma
-GRAMMARCMA:=grammar/compat5.cmo grammar/grammar.cma
+GRAMMARCMA:=grammar/grammar.cma
# modules known by the toplevel of Coq
diff --git a/grammar/compat5.ml b/grammar/compat5.ml
deleted file mode 100644
index 370d9e3a0..000000000
--- a/grammar/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-2017 *)
-(* \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/CoqMakefile.in b/tools/CoqMakefile.in
index f1e519d03..e54ea45d4 100644
--- a/tools/CoqMakefile.in
+++ b/tools/CoqMakefile.in
@@ -182,7 +182,7 @@ else
CAMLP4EXTEND=
endif
-PP:=-pp '$(CAMLP4O) -I $(CAMLLIB) -I "$(COQLIB)/grammar" compat5.cmo $(CAMLP4EXTEND) $(GRAMMARS) $(CAMLP4OPTIONS) -impl'
+PP:=-pp '$(CAMLP4O) -I $(CAMLLIB) -I "$(COQLIB)/grammar" $(CAMLP4EXTEND) $(GRAMMARS) $(CAMLP4OPTIONS) -impl'
ifneq (,$(TIMING))
TIMING_ARG=-time