X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.common.in;h=5e30807819f7a4d2c528f78c4439cbb61d20c857;hb=ac7687ce66526f905874ed99a845223c853c558a;hp=984b97381e3a84a34c8fb36a851fa3195898fb49;hpb=d28f7a101a0d2d87a3051bd3b4a5e78d86f605ba;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 984b97381..5e3080781 100644
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -11,16 +11,21 @@
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
 PREPROCOPTIONS = -pp camlp4o
+SYNTAXOPTIONS = -syntax camlp4o
 PREREQ =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLDEBUGOPTIONS = -g
-OCAMLFIND = ocamlfind
+OCAMLARCHIVEOPTIONS =
+OCAMLFIND = @OCAMLFIND@
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLDEP = $(OCAMLFIND) ocamldep $(PREPROCOPTIONS)
+OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4,$(REQUIRES)" $(SYNTAXOPTIONS)
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
+OCAMLC_P4 = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(SYNTAXOPTIONS)
+OCAMLOPT_P4 = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(SYNTAXOPTIONS)
+
 LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 
@@ -33,10 +38,12 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
-	$(OCAMLC) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
+	$(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
+		$(IMPLEMENTATION_FILES:%.ml=%.cmo)
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
-	$(OCAMLOPT) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
+	$(OCAMLOPT) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
+		$(IMPLEMENTATION_FILES:%.ml=%.cmx)
 
 prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)