From 223e208e2b0c432d9c5c1aef91ca6114cf97933b Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Mon, 11 Oct 2004 19:18:37 +0000 Subject: [PATCH] Added -syntax support (if needed, use OCAMLC_P4 instead of OCAMLC in Makefile); ocamldep uses it by default. --- helm/ocaml/Makefile.common.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in index 8079765c4..81a84e42c 100644 --- 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)) -- 2.39.2