diff options
| author | Pierre Letouzey | 2016-05-31 12:14:55 +0200 |
|---|---|---|
| committer | Pierre Letouzey | 2016-06-01 00:53:49 +0200 |
| commit | d0a9edabf59a858625d11516cdb230d223a77aeb (patch) | |
| tree | b5b416167824a209b8842e41d6bed19bc57f2a19 /grammar | |
| parent | 1532e4d57fce07e8a1cd6838853a4a31ea84e453 (diff) | |
Yet another Makefile reform : a unique phase without nasty make tricks
We're back to a unique build phase (as before e372b72), but without
relying on the awkward include-deps-failed-lets-retry feature of make.
Since PMP has made grammar/ self-contained, we could now build
grammar.cma in a rather straightforward way, no need for
a specific sub-call to $(MAKE) for that. The dependencies between
files of grammar/ are stated explicitely, since .d files aren't
fully available initially.
Some Makefile simplifications, for instance remove the CAMLP4DEPS
shell horror. Instead, we generalize the use of two different
filename extensions :
- a .mlp do not need grammar.cma (they are in grammar/ and tools/compat5*.mlp)
- a .ml4 is now always preprocessed with grammar.cma (and q_constr.cmo),
except coqide_main.ml4 and its specific rule
Note that we do not generate .ml4.d anymore (thanks to the .mlp vs.
.ml4 dichotomy)
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/argextend.mlp (renamed from grammar/argextend.ml4) | 2 | ||||
| -rw-r--r-- | grammar/gramCompat.mlp (renamed from grammar/gramCompat.ml4) | 0 | ||||
| -rw-r--r-- | grammar/q_constr.mlp (renamed from grammar/q_constr.ml4) | 2 | ||||
| -rw-r--r-- | grammar/q_util.mlp (renamed from grammar/q_util.ml4) | 0 | ||||
| -rw-r--r-- | grammar/tacextend.mlp (renamed from grammar/tacextend.ml4) | 2 | ||||
| -rw-r--r-- | grammar/vernacextend.mlp (renamed from grammar/vernacextend.ml4) | 2 |
6 files changed, 0 insertions, 8 deletions
diff --git a/grammar/argextend.ml4 b/grammar/argextend.mlp index 8e06adce92..eaaa7f0256 100644 --- a/grammar/argextend.ml4 +++ b/grammar/argextend.mlp @@ -6,8 +6,6 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i camlp4deps: "tools/compat5b.cmo" i*) - open Q_util open GramCompat diff --git a/grammar/gramCompat.ml4 b/grammar/gramCompat.mlp index 6246da7bb6..6246da7bb6 100644 --- a/grammar/gramCompat.ml4 +++ b/grammar/gramCompat.mlp diff --git a/grammar/q_constr.ml4 b/grammar/q_constr.mlp index af90f5f2ae..8e1587ec34 100644 --- a/grammar/q_constr.ml4 +++ b/grammar/q_constr.mlp @@ -6,8 +6,6 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i camlp4deps: "tools/compat5b.cmo" i*) - open Q_util open GramCompat open Pcaml diff --git a/grammar/q_util.ml4 b/grammar/q_util.mlp index 2d5c40894a..2d5c40894a 100644 --- a/grammar/q_util.ml4 +++ b/grammar/q_util.mlp diff --git a/grammar/tacextend.ml4 b/grammar/tacextend.mlp index 8593bad5d0..1d52a85a55 100644 --- a/grammar/tacextend.ml4 +++ b/grammar/tacextend.mlp @@ -6,8 +6,6 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i camlp4deps: "tools/compat5b.cmo" i*) - (** Implementation of the TACTIC EXTEND macro. *) open Q_util diff --git a/grammar/vernacextend.ml4 b/grammar/vernacextend.mlp index 1611de39c2..fa8610fb98 100644 --- a/grammar/vernacextend.ml4 +++ b/grammar/vernacextend.mlp @@ -6,8 +6,6 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i camlp4deps: "tools/compat5b.cmo" i*) - (** Implementation of the VERNAC EXTEND macro. *) open Q_util |