snapshot

[helm.git] / helm / ocaml / cic_notation / Makefile

diff --git a/helm/ocaml/cic_notation/Makefile b/helm/ocaml/cic_notation/Makefile
index 5c3b094087d8f08dcd123b249dba5f8dcc1175df..6a43c489036af172b4673673f986b50b93f386ab 100644 (file)
--- a/helm/ocaml/cic_notation/Makefile
+++ b/helm/ocaml/cic_notation/Makefile
@@ -1,10 +1,12 @@
 
 PACKAGE = cic_notation
-REQUIRES = \
-       helm-cic        \
-       helm-utf8_macros \
-       ulex
 NULL =
+REQUIRES = \
+       helm-cic                \
+       helm-utf8_macros        \
+       camlp4.gramlib          \
+       ulex                    \
+       $(NULL)
 INTERFACE_FILES = \
        cicNotationLexer.mli    \
        cicNotationParser.mli   \
@@ -16,17 +18,6 @@ IMPLEMENTATION_FILES = \
 
 all:
 
-cicNotationLexer.cmo: cicNotationLexer.ml cicNotationLexer.cmi
-       $(OCAMLC_P4) -c $<
-cicNotationLexer.cmx: cicNotationLexer.ml cicNotationLexer.cmi
-       $(OCAMLOPT_P4) -c $<
-cicNotationParser.cmo: REQUIRES = helm-utf8_macros camlp4.gramlib helm-cic
-cicNotationParser.cmo: cicNotationParser.ml cicNotationParser.cmi cicNotationLexer.cmi
-       $(OCAMLC_P4) -c $<
-cicNotationParser.cmx: REQUIRES = helm-utf8_macros camlp4.gramlib
-cicNotationParser.cmx: cicNotationParser.ml cicNotationParser.cmi cicNotationLexer.cmi
-       $(OCAMLOPT_P4) -c $<
-
 LOCAL_LINKOPTS = -package helm-cic_notation -linkpkg
 test: test_lexer test_parser
 test_lexer: test_lexer.ml $(PACKAGE).cma
@@ -34,6 +25,11 @@ test_lexer: test_lexer.ml $(PACKAGE).cma
 test_parser: test_parser.ml $(PACKAGE).cma
        $(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
 
+cicNotationLexer.cmo: OCAMLC = $(OCAMLC_P4)
+cicNotationParser.cmo: OCAMLC = $(OCAMLC_P4)
+cicNotationLexer.cmx: OCAMLC = $(OCAMLC_P4)
+cicNotationParser.cmx: OCAMLC = $(OCAMLC_P4)
+
 clean: extra_clean
 distclean: extra_clean
        rm -f macro_table.dump