diff options
author | Maxime Dénès <mail@maximedenes.fr> | 2017-08-01 13:02:27 +0200 |
---|---|---|
committer | Maxime Dénès <mail@maximedenes.fr> | 2017-08-01 13:02:27 +0200 |
commit | 5bb4a60965169fb95027f16ef4d668959655cae0 (patch) | |
tree | 84a053d0fad4c77ab1def66da5cce913d819791c | |
parent | a893cd2993acb8da5a17aa57694ded2355e8eaea (diff) | |
parent | 436abd92a520f13843b102b24b61802c88c7dba7 (diff) |
Merge PR #921: [make] remove compat5 file.
-rw-r--r-- | Makefile.build | 2 | ||||
-rw-r--r-- | Makefile.common | 2 | ||||
-rw-r--r-- | grammar/compat5.ml | 13 | ||||
-rw-r--r-- | tools/CoqMakefile.in | 2 |
4 files changed, 3 insertions, 16 deletions
diff --git a/Makefile.build b/Makefile.build index 7961092fa..b45c6427a 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 |