X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FMakefile;h=ec24a4f4d6610ae3a9ba43d471b4b06b2bd9c07c;hb=a886fdf011c202071e76c5716d59a335ec5d321d;hp=9652369b4d872134bd27588d5dbada175510586d;hpb=16963bcfad9417a0511c74685e86ca76adf49f92;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile
index 9652369b4..ec24a4f4d 100644
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,25 +1,19 @@
 
 PACKAGE = cic_textual_parser2
 REQUIRES = \
-	ulex pxp helm-tactics helm-cic helm-logger helm-cic_unification \
-	camlp4.gramlib
+	helm-tactics helm-logger helm-cic_unification helm-cic_transformations \
+	ulex pxp camlp4.gramlib
 NOTATIONS = logic arit tex
 INTERFACE_FILES = \
-	cicTextualParser2Ast.mli \
-	cicTextualParser2Pp.mli \
+	disambiguateTypes.mli \
+	disambiguateChoices.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 +27,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 +71,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 $<