X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FMakefile;h=de0cf3ba22f7656a60d608e8f75bc8de5e365c70;hb=f55b5800229c0819448abf38dfeb1527b4ec08e2;hp=11da724694d4c626a927c63a14fd930108aacb1b;hpb=aba014724c9ad08f80944ec3021c9fa3826dca4a;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile
index 11da72469..de0cf3ba2 100644
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,35 +1,36 @@
 
 PACKAGE = cic_textual_parser2
 REQUIRES = \
-	ulex pxp helm-tactics helm-cic helm-logger helm-cic_unification \
-	camlp4.gramlib
-NOTATIONS = logic arit
+	helm-tactics helm-logger helm-cic_unification helm-cic_transformations \
+	helm-pxp helm-utf8_macros \
+	ulex
+NOTATIONS = logic arit tex
+# NOTATIONS = logic arit
 INTERFACE_FILES = \
-	ast.mli pp.mli macro.mli lexer.mli disambiguate.mli parser.mli \
-	disambiguate_types.mli
+	disambiguateTypes.mli \
+	disambiguateChoices.mli \
+	cicTextualLexer2.mli \
+	cicTextualParser2.mli \
+	disambiguate.mli
 IMPLEMENTATION_FILES = \
-	pp.ml macro.ml lexer.ml disambiguate_struct.ml parser.ml \
-	disambiguate.ml \
-	$(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
+	$(patsubst %.mli, %.ml, $(INTERFACE_FILES)) \
+	$(patsubst %,%_notation.ml,$(NOTATIONS))
 
 all:
 
-lexer.cmo: lexer.ml
-	$(OCAMLC) -pp "camlp4o $(LEXER_P4_OPTS)" -c $<
-parser.cmo: parser.ml macro.cmo pa_unicode_macro.cmo
-	$(OCAMLC) -pp "camlp4o $(PARSER_P4_OPTS)" -c $<
-
-%_notation.cmo: %_notation.ml parser.cmo
-	$(OCAMLC) -pp "camlp4o $(PARSER_P4_OPTS)" -c $<
+cicTextualLexer2.cmo: cicTextualLexer2.ml
+	$(OCAMLC_P4) -c $<
+cicTextualParser2.cmo: cicTextualParser2.ml
+	$(OCAMLC_P4) -c $<
+cicTextualLexer2.cmx: cicTextualLexer2.ml
+	$(OCAMLOPT_P4) -c $<
+cicTextualParser2.cmx: cicTextualParser2.ml
+	$(OCAMLOPT_P4) -c $<
 
-pa_unicode_macro.cmo: pa_unicode_macro.ml macro.cmo
-	$(OCAMLC) -pp "camlp4o $(PA_P4_OPTS)" -c $<
+%_notation.cmo: %_notation.ml
+	$(OCAMLC_P4) -c $<
+%_notation.cmx: %_notation.ml
+	$(OCAMLOPT_P4) -c $<
 
 LOCAL_LINKOPTS = -linkpkg $(PACKAGE).cma
 test: test_lexer test_parser
@@ -37,25 +38,20 @@ 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
+OCAMLARCHIVEOPTIONS += -linkall
 
-.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
-
-disambiguate_types.cmi: disambiguate_types.mli
+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 $<