diff options
| author | letouzey | 2010-03-04 16:18:07 +0000 |
|---|---|---|
| committer | letouzey | 2010-03-04 16:18:07 +0000 |
| commit | 58a5a535b138c6a3e98bc3631ebe3e0e2bc3fcd5 (patch) | |
| tree | 4e085ae797dbfa93161deb5733c2343147ac5509 /Makefile.common | |
| parent | 4d44ec1d6b4bbcb05418738df6ce611ee6c31b01 (diff) | |
Makefile: the .ml of .ml4 are now produced explicitely (in binary ast form)
- This way, the Makefile.build gets shorter and simplier, with a few nasty
hacks removed.
- In particular, we stop creating dummy .ml of .ml4 early "to please ocamldep".
Instead, we now use ocamldep -modules, and process its output via coqdep_boot.
This ways, *.cm* of .ml4 are correctly located, even when some .ml files
aren't generated yet.
- There is no risk of editing the .ml of a .ml4 by mistake, since it is by
default in a binary format (cf pr_o.cmo and variable READABLE_ML4).
M-x next-error still open the right .ml4 at the right location.
- mltop.byteml is now mltop.ml, while mltop.optml keeps its name
- .ml of .ml4 are added to .gitignore
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12833 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index de84aaefe3..8a29988d52 100644 --- a/Makefile.common +++ b/Makefile.common @@ -372,8 +372,8 @@ CAML_OBJECT_PATTERNS:=%.cmo %.cmx %.cmi %.cma %.cmxa %.cmxs %.dep.ps %.dot STAGE1_TARGETS:= $(STAGE1) $(COQDEPBOOT) \ $(GENFILES) \ - source-doc revision toplevel/mltop.byteml toplevel/mltop.optml \ - $(STAGE1_ML4:.ml4=.ml4-preprocessed) %.o + source-doc revision toplevel/mltop.ml toplevel/mltop.optml \ + $(STAGE1_ML4:.ml4=.ml) %.o ifdef CM_STAGE1 STAGE1_TARGETS+=$(CAML_OBJECT_PATTERNS) @@ -402,7 +402,7 @@ STAGE2_TARGETS:=$(COQBINARIES) lib kernel byterun library proofs tactics \ world install coqide coqide-files coq coqlib \ coqlight states check init theories theories-light \ $(DOC_TARGETS) $(VO_TARGETS) validate \ - %.vo %.glob states/% install-% %.ml4-preprocessed \ + %.vo %.glob states/% install-% \ $(DOC_TARGET_PATTERNS) ifndef CM_STAGE1 |