From bf962b3fae1f3ac8eb2170fb8d33fb004c3445fa Mon Sep 17 00:00:00 2001
From: notin
Date: Thu, 4 May 2006 13:25:52 +0000
Subject: - intégration de la modification suggérée par L. Mamane: coqmktop
 passe maintenant aussi l'option -dtypes à ocamlmktop - ajout d'une variable
 USERFLAGS, permettant à un utilisateur de rajouter facilement des options de
 compilation

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@8787 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile                 | 5 +++--
 config/Makefile.template | 3 +++
 scripts/coqmktop.ml      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index fd8e52c83a..45ae6c8c98 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,8 @@ LOCALINCLUDES=-I config -I tools -I tools/coqdoc \
 
 MLINCLUDES=$(LOCALINCLUDES) -I $(MYCAMLP4LIB)
 
-BYTEFLAGS=$(MLINCLUDES) $(CAMLDEBUG)
-OPTFLAGS=$(MLINCLUDES) $(CAMLTIMEPROF) -noassert
+BYTEFLAGS=$(MLINCLUDES) $(CAMLDEBUG) $(USERFLAGS)
+OPTFLAGS=$(MLINCLUDES) $(CAMLTIMEPROF) $(USERFLAGS) -noassert
 OCAMLDEP=ocamldep
 DEPFLAGS=$(LOCALINCLUDES)
 
@@ -1696,5 +1696,6 @@ devel:
 clean::
 	find . -name "\.#*" -exec rm -f {} \;
 	find . -name "*~" -exec rm -f {} \;
+	find . -name "*.annot" -exec rm -f {} \;
 
 ###########################################################################
diff --git a/config/Makefile.template b/config/Makefile.template
index f30ed2114d..aa7f2d6219 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -60,6 +60,9 @@ CAMLMKTOP=ocamlmktop
 # Compilation debug flag
 CAMLDEBUG=COQDEBUGFLAG
 
+# User compilation flag
+USERFLAGS=
+
 # Compilation profile flag
 CAMLTIMEPROF=COQPROFILEFLAG
 
diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml
index 784bbdc3d2..b57361a430 100644
--- a/scripts/coqmktop.ml
+++ b/scripts/coqmktop.ml
@@ -166,7 +166,7 @@ let parse_args () =
         parse ((List.rev(List.flatten (List.map (fun d -> ["-I";d])
 					 (all_subdirs a))))@op,fl) rem
     | "-R" :: [] -> usage ()
-    | ("-noassert"|"-compact"|"-g"|"-p"|"-thread" as o) :: rem ->
+    | ("-noassert"|"-compact"|"-g"|"-p"|"-thread"|"-dtypes" as o) :: rem ->
         parse (o::op,fl) rem
     | ("-h"|"--help") :: _ -> usage ()
     | f :: rem ->
-- 
cgit v1.2.3