aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authornotin2006-07-28 18:05:39 +0000
committernotin2006-07-28 18:05:39 +0000
commit7e13b8a0627c09a49487dc64210fa4616cffc66c (patch)
treeb44dee28523fd5f63edde51c15571d69251ab221 /Makefile
parent5ce1ece6393b33a213dfba2e3b63a130e398d84f (diff)
Modifications dans les scripts de configuration (coqtop et coqide affichent maintenant le numéro de révision svn) + correction problème OCaml 3.07 et caml_;odify
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9063 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 447287b8c3..61594f4f5e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ NOARG:
@echo "For make to be verbose, add VERBOSE=1"
# build and install the three subsystems: coq, coqide, pcoq
-world: coq coqide pcoq
+world: revision coq coqide pcoq
install: install-coq install-coqide install-pcoq
#install-manpages: install-coq-manpages install-pcoq-manpages
@@ -93,7 +93,6 @@ TIME= # is "'time -p'" to get compilation time of .v
BOOTCOQTOP= $(TIME) $(BESTCOQTOP) -boot $(COQOPTS)
-
###########################################################################
# Objects files
###########################################################################
@@ -351,7 +350,12 @@ CINCLUDES= -I $(CAMLHLIB)
CC=gcc
AR=ar
RANLIB=ranlib
-BYTECCCOMPOPTS=-fno-defer-pop -Wall -Wno-unused
+
+ifeq ($(CAMLVERSION),OCAML307)
+ CFLAGS=-fno-defer-pop -Wall -Wno-unused -DOCAML_307
+else
+ CFLAGS=-fno-defer-pop -Wall -Wno-unused
+endif
# libcoqrun.a