From 58a5a535b138c6a3e98bc3631ebe3e0e2bc3fcd5 Mon Sep 17 00:00:00 2001
From: letouzey
Date: Thu, 4 Mar 2010 16:18:07 +0000
Subject: 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
---
 Makefile.stage2 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'Makefile.stage2')

diff --git a/Makefile.stage2 b/Makefile.stage2
index 8f3d4e8bf7..a7ecddc13e 100644
--- a/Makefile.stage2
+++ b/Makefile.stage2
@@ -13,14 +13,11 @@ include Makefile.doc
 .SECONDARY: $(MLLIBFILES:.mllib=.mllib.d)
 -include $(filter plugins/%,$(MLLIBFILES:%.mllib=%_mod.ml.d))
 .SECONDARY: $(filter plugins/%,$(MLLIBFILES:%.mllib=%_mod.ml.d))
--include $(ML4FILES:.ml4=.ml4.ml.d)
-.SECONDARY: $(ML4FILES:.ml4=.ml4.ml.d)
+-include $(ML4FILES:.ml4=.ml.d)
+.SECONDARY: $(ML4FILES:.ml4=.ml.d)
 -include $(VFILES:.v=.v.d)
 .SECONDARY: $(VFILES:.v=.v.d)
 
-.PHONY: stage2
-stage2: world
-
 # For emacs: 
 # Local Variables: 
 # mode: makefile 
-- 
cgit v1.2.3