opt goal fixed

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

diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile
index 9652369b4d872134bd27588d5dbada175510586d..a3d6297e303b8861d8459f0f11f19368a247726f 100644 (file)
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,25 +1,18 @@
 
 PACKAGE = cic_textual_parser2
-REQUIRES = \
-       ulex pxp helm-tactics helm-cic helm-logger helm-cic_unification \
-       camlp4.gramlib
+REQUIRES = ulex pxp helm-tactics helm-logger helm-cic_unification camlp4.gramlib
 NOTATIONS = logic arit tex
 INTERFACE_FILES = \
-       cicTextualParser2Ast.mli \
+       disambiguateTypes.mli \
+       disambiguateChoices.mli \
        cicTextualParser2Pp.mli \
        macro.mli \
        cicTextualLexer2.mli \
-       disambiguate.mli \
        cicTextualParser2.mli \
-       disambiguateTypes.mli
+       disambiguate.mli
 IMPLEMENTATION_FILES = \
-       disambiguateTypes.ml \
-       cicTextualParser2Pp.ml \
-       macro.ml \
-       cicTextualLexer2.ml \
-       cicTextualParser2.ml \
-       disambiguate.ml \
-       $(patsubst %,%_notation.ml,$(NOTATIONS)) \
+       $(patsubst %.mli, %.ml, $(INTERFACE_FILES)) \
+       $(patsubst %,%_notation.ml,$(NOTATIONS))
 
 ULEXDIR := $(shell ocamlfind query ulex)
 
@@ -33,12 +26,20 @@ cicTextualLexer2.cmo: cicTextualLexer2.ml
        $(OCAMLC) -pp "camlp4o $(LEXER_P4_OPTS)" -c $<
 cicTextualParser2.cmo: cicTextualParser2.ml macro.cmo pa_unicode_macro.cmo
        $(OCAMLC) -pp "camlp4o $(PARSER_P4_OPTS)" -c $<
+cicTextualLexer2.cmx: cicTextualLexer2.ml
+       $(OCAMLOPT) -pp "camlp4o $(LEXER_P4_OPTS)" -c $<
+cicTextualParser2.cmx: cicTextualParser2.ml macro.cmo pa_unicode_macro.cmo
+       $(OCAMLOPT) -pp "camlp4o $(PARSER_P4_OPTS)" -c $<
 
 %_notation.cmo: %_notation.ml cicTextualParser2.cmo
        $(OCAMLC) -pp "camlp4o $(PARSER_P4_OPTS)" -c $<
+%_notation.cmx: %_notation.ml cicTextualParser2.cmx
+       $(OCAMLOPT) -pp "camlp4o $(PARSER_P4_OPTS)" -c $<
 
 pa_unicode_macro.cmo: pa_unicode_macro.ml macro.cmo
        $(OCAMLC) -pp "camlp4o $(PA_P4_OPTS)" -c $<
+pa_unicode_macro.cmx: pa_unicode_macro.ml macro.cmx
+       $(OCAMLOPT) -pp "camlp4o $(PA_P4_OPTS)" -c $<
 
 LOCAL_LINKOPTS = -linkpkg $(PACKAGE).cma
 test: test_lexer test_parser
@@ -69,4 +70,6 @@ disambiguateTypes.cmi: disambiguateTypes.mli
        $(OCAMLC) -c -rectypes $<
 disambiguateTypes.cmo: disambiguateTypes.ml disambiguateTypes.cmi
        $(OCAMLC) -c -rectypes $<
+disambiguateTypes.cmx: disambiguateTypes.ml disambiguateTypes.cmi
+       $(OCAMLOPT) -c -rectypes $<