X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FMakefile;h=bacedc25e3b6c04ca3fb672f818bbf8db02a6c51;hb=2eb1644f907fc2319957fad1511ad98dccc89209;hp=cadca9413de29174c886d6203d72ebb98dcdd86d;hpb=6459acbd4bb69475cfaa0b37a9771ced94193667;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile
index cadca9413..bacedc25e 100644
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,12 +1,14 @@
 
 PACKAGE = cic_textual_parser2
-REQUIRES = ulex pxp helm-tactics helm-logger helm-cic_unification camlp4.gramlib
+REQUIRES = \
+	helm-tactics helm-logger helm-cic_unification helm-cic_transformations \
+	helm-utf8_macros \
+	ulex
 NOTATIONS = logic arit tex
+# NOTATIONS = logic arit
 INTERFACE_FILES = \
 	disambiguateTypes.mli \
 	disambiguateChoices.mli \
-	cicTextualParser2Pp.mli \
-	macro.mli \
 	cicTextualLexer2.mli \
 	cicTextualParser2.mli \
 	disambiguate.mli
@@ -14,52 +16,42 @@ IMPLEMENTATION_FILES = \
 	$(patsubst %.mli, %.ml, $(INTERFACE_FILES)) \
 	$(patsubst %,%_notation.ml,$(NOTATIONS))
 
-ULEXDIR := $(shell ocamlfind query ulex)
-
-LEXER_P4_OPTS = -I $(ULEXDIR) pa_ulex.cma
-PARSER_P4_OPTS = pa_extend.cmo ./macro.cmo ./pa_unicode_macro.cmo
-PA_P4_OPTS = q_MLast.cmo pa_extend.cmo
-
 all:
 
 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 $<
-
-%_notation.cmo: %_notation.ml cicTextualParser2.cmo
-	$(OCAMLC) -pp "camlp4o $(PARSER_P4_OPTS)" -c $<
-
-pa_unicode_macro.cmo: pa_unicode_macro.ml macro.cmo
-	$(OCAMLC) -pp "camlp4o $(PA_P4_OPTS)" -c $<
-
-LOCAL_LINKOPTS = -linkpkg $(PACKAGE).cma
+	$(OCAMLC_P4) -c $<
+cicTextualParser2.cmo: cicTextualParser2.ml
+	$(OCAMLC_P4) -c $<
+cicTextualLexer2.cmx: cicTextualLexer2.ml
+	$(OCAMLOPT_P4) -c $<
+cicTextualParser2.cmx: cicTextualParser2.ml
+	$(OCAMLOPT_P4) -c $<
+
+%_notation.cmo: %_notation.ml
+	$(OCAMLC_P4) -c $<
+%_notation.cmx: %_notation.ml
+	$(OCAMLOPT_P4) -c $<
+
+LOCAL_LINKOPTS = -package helm-cic_textual_parser2 -linkpkg
 test: test_lexer test_parser
 test_lexer: test_lexer.ml $(PACKAGE).cma
 	$(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
 test_parser: test_parser.ml $(PACKAGE).cma
 	$(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
-make_table: make_table.ml
-	$(OCAMLC) -linkpkg -o $@ $<
-
-.PHONY: macro_table.dump
-macro_table.dump: make_table
-	./make_table $@
 
 clean: extra_clean
 distclean: extra_clean
 	rm -f macro_table.dump
 extra_clean:
-	rm -f test_lexer test_parser make_table
+	rm -f test_lexer test_parser
 
 include ../Makefile.common
-
-.PHONY: depend
-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
+OCAMLARCHIVEOPTIONS += -linkall
 
 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 $<