aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorherbelin2004-07-16 21:04:34 +0000
committerherbelin2004-07-16 21:04:34 +0000
commitf723ccc84f515615a75a030d304c89f6c5f06af9 (patch)
treebcf811178e74a1d6a4a2297862f5f6108a196d24 /Makefile
parent56ba53113c03907a3d4e0528b14ff5c5ffcc9b61 (diff)
Mise en place mécanisme de compatibilité ocaml 3.08
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5930 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 15 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 949d03dbb1..e688304e3b 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@
include config/Makefile
-noargument:
+NOARG:
@echo "Please use either"
@echo " ./configure"
@echo " make world"
@@ -84,7 +84,7 @@ DEPFLAGS=$(LOCALINCLUDES)
OCAMLC_P4O=$(OCAMLC) -pp $(CAMLP4O) $(BYTEFLAGS)
OCAMLOPT_P4O=$(OCAMLOPT) -pp $(CAMLP4O) $(OPTFLAGS)
-CAMLP4EXTENDFLAGS=-I . pa_extend.cmo pa_extend_m.cmo q_MLast.cmo
+CAMLP4EXTENDFLAGS=-I . pa_extend.cmo pa_extend_m.cmo pa_macro.cmo q_MLast.cmo
CAMLP4DEPS=sed -n -e 's|^(\*.*camlp4deps: "\(.*\)".*\*)$$|\1|p'
COQINCLUDES= # coqtop includes itself the needed paths
@@ -107,7 +107,7 @@ CONFIG=\
config/coq_config.cmo
LIBREP=\
- lib/pp_control.cmo lib/pp.cmo lib/util.cmo lib/bignat.cmo \
+ lib/pp_control.cmo lib/pp.cmo lib/compat.cmo lib/util.cmo lib/bignat.cmo \
lib/hashcons.cmo lib/dyn.cmo lib/system.cmo lib/options.cmo \
lib/bstack.cmo lib/edit.cmo lib/gset.cmo lib/gmap.cmo \
lib/tlm.cmo lib/gmapl.cmo lib/profile.cmo lib/explore.cmo \
@@ -1297,7 +1297,7 @@ ML4FILES += parsing/lexer.ml4 parsing/q_util.ml4 parsing/q_coqast.ml4 \
parsing/g_prim.ml4 parsing/pcoq.ml4
GRAMMARNEEDEDCMO=\
- lib/pp_control.cmo lib/pp.cmo lib/util.cmo lib/bignat.cmo \
+ lib/pp_control.cmo lib/pp.cmo lib/compat.cmo lib/util.cmo lib/bignat.cmo \
lib/dyn.cmo lib/options.cmo \
lib/hashcons.cmo lib/predicate.cmo lib/rtree.cmo \
kernel/names.cmo kernel/univ.cmo kernel/esubst.cmo kernel/term.cmo \
@@ -1396,9 +1396,20 @@ proofs/tacexpr.cmx: proofs/tacexpr.ml
$(SHOW)'OCAMLOPT -rectypes $<'
$(HIDE)$(OCAMLOPT) -rectypes $(OPTFLAGS) -c $<
+# files compiled with camlp4 because of macros
+
+lib/compat.cmo: lib/compat.ml4
+ $(SHOW)'OCAMLC4 $<'
+ $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) -D$(CAMLVERSION) -impl" -c -impl $<
+
+lib/compat.cmx: lib/compat.ml4
+ $(SHOW)'OCAMLC $<'
+ $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) -D$(CAMLVERSION) -impl" -c -impl $<
+
# files compiled with camlp4 because of streams syntax
ML4FILES += lib/pp.ml4 \
+ lib/compat.ml4 \
contrib/xml/xml.ml4 \
contrib/xml/acic2Xml.ml4 \
contrib/xml/proofTree2Xml.ml4 \