X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2FMakefile.common;h=5090dcc78309151231efaa2eee9f923fec0c2c3e;hb=42f2dc48b4fef5b404f406bf512d6a0cde35c067;hp=59b35aa7371348377d34bd9d6b4735169b708165;hpb=b3779638cd49747f4b71784fba57cfb0a56297f5;p=helm.git diff --git a/components/Makefile.common b/components/Makefile.common index 59b35aa73..5090dcc78 100644 --- a/components/Makefile.common +++ b/components/Makefile.common @@ -11,10 +11,10 @@ H=@ # $OCAMLFIND must be set to a meaningful vaule, including OCAMLPATH= -PREPROCOPTIONS = -pp camlp4o -SYNTAXOPTIONS = -syntax camlp4o +PREPROCOPTIONS = -pp camlp5o +SYNTAXOPTIONS = -syntax camlp5o PREREQ = -OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread +OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread -rectypes OCAMLDEBUGOPTIONS = -g #OCAML_PROF=p -p a OCAMLARCHIVEOPTIONS = @@ -22,7 +22,7 @@ REQUIRES := $(shell $(OCAMLFIND) -query -format '%(requires)' helm-$(PACKAGE)) OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS) #OCAMLOPT_DEBUG_FLAGS = -p OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS) $(OCAMLOPT_DEBUG_FLAGS) -OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4 $(CAMLP4REQUIRES)" $(SYNTAXOPTIONS) $(OCAMLDEPOPTIONS) +OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp5 $(CAMLP5REQUIRES)" $(SYNTAXOPTIONS) $(OCAMLDEPOPTIONS) OCAMLLEX = ocamllex OCAMLYACC = ocamlyacc