Added -syntax support (if needed, use OCAMLC_P4 instead of OCAMLC in

Makefile); ocamldep uses it by default.

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 8079765c4a46a631f7e4ccbdce765c91d7f64017..81a84e42caccf7dffe0cd16cbd26c5ee042891d9 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -11,6 +11,7 @@
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
 PREPROCOPTIONS = -pp camlp4o
+SYNTAXOPTIONS = -syntax camlp4o
 PREREQ =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLDEBUGOPTIONS = -g
@@ -18,10 +19,13 @@ OCAMLARCHIVEOPTIONS =
 OCAMLFIND = @OCAMLFIND@
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLDEP = $(OCAMLFIND) ocamldep $(PREPROCOPTIONS)
+OCAMLDEP = $(OCAMLFIND) ocamldep -package "$(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))