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 3a0ae7b80f03097ba9df33d8830c8f2c5d1cc0f1..a3d6297e303b8861d8459f0f11f19368a247726f 100644 (file)
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,17 +1,18 @@
 
 PACKAGE = cic_textual_parser2
-REQUIRES = \
-       ulex pxp helm-tactics helm-cic helm-logger helm-cic_unification \
-       camlp4.gramlib
-NOTATIONS = logic arit
+REQUIRES = ulex pxp helm-tactics helm-logger helm-cic_unification camlp4.gramlib
+NOTATIONS = logic arit tex
 INTERFACE_FILES = \
-       ast.mli pp.mli macro.mli lexer.mli disambiguate.mli parser.mli \
-       disambiguate_types.mli
+       disambiguateTypes.mli \
+       disambiguateChoices.mli \
+       cicTextualParser2Pp.mli \
+       macro.mli \
+       cicTextualLexer2.mli \
+       cicTextualParser2.mli \
+       disambiguate.mli
 IMPLEMENTATION_FILES = \
-       disambiguate_types.ml \
-       pp.ml macro.ml lexer.ml parser.ml \
-       disambiguate.ml \
-       $(patsubst %,%_notation.ml,$(NOTATIONS)) \
+       $(patsubst %.mli, %.ml, $(INTERFACE_FILES)) \
+       $(patsubst %,%_notation.ml,$(NOTATIONS))
 
 ULEXDIR := $(shell ocamlfind query ulex)
 
@@ -21,16 +22,24 @@ PA_P4_OPTS = q_MLast.cmo pa_extend.cmo
 
 all:
 
-lexer.cmo: lexer.ml
+cicTextualLexer2.cmo: cicTextualLexer2.ml
        $(OCAMLC) -pp "camlp4o $(LEXER_P4_OPTS)" -c $<
-parser.cmo: parser.ml macro.cmo pa_unicode_macro.cmo
+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 parser.cmo
+%_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
@@ -57,8 +66,10 @@ include ../Makefile.common
 depend: macro.cmi macro.cmo pa_unicode_macro.cmi pa_unicode_macro.cmo
        $(OCAMLDEP) -pp "camlp4o $(PARSER_P4_OPTS) $(LEXER_P4_OPTS)" $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
 
-disambiguate_types.cmi: disambiguate_types.mli
+disambiguateTypes.cmi: disambiguateTypes.mli
        $(OCAMLC) -c -rectypes $<
-disambiguate_types.cmo: disambiguate_types.ml disambiguate_types.cmi
+disambiguateTypes.cmo: disambiguateTypes.ml disambiguateTypes.cmi
        $(OCAMLC) -c -rectypes $<
+disambiguateTypes.cmx: disambiguateTypes.ml disambiguateTypes.cmi
+       $(OCAMLOPT) -c -rectypes $<