X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FMakefile;h=53c39ee5e95d489aa2e3015afa7e66d444f487e3;hb=9230a8085102cd39258c047949e87001be6ffcf0;hp=6b4d13c26ace2e28c5e222111a5e722eb8e564d2;hpb=879797d6505bc39489009d9ae1e2506022bde9e2;p=helm.git

diff --git a/helm/ocaml/cic_notation/Makefile b/helm/ocaml/cic_notation/Makefile
index 6b4d13c26..53c39ee5e 100644
--- a/helm/ocaml/cic_notation/Makefile
+++ b/helm/ocaml/cic_notation/Makefile
@@ -1,35 +1,25 @@
 
 PACKAGE = cic_notation
-REQUIRES = \
-	helm-utf8_macros \
-	ulex
-NOTATIONS =
 NULL =
+REQUIRES = \
+	helm-cic		\
+	helm-utf8_macros	\
+	camlp4.gramlib		\
+	ulex			\
+	$(NULL)
 INTERFACE_FILES = \
 	cicNotationLexer.mli	\
+	cicNotationEnv.mli	\
+	cicNotationPp.mli	\
 	cicNotationParser.mli	\
 	$(NULL)
 IMPLEMENTATION_FILES = \
+	cicNotationPt.ml	\
 	$(patsubst %.mli, %.ml, $(INTERFACE_FILES))	\
-	$(patsubst %,%_notation.ml,$(NOTATIONS))	\
 	$(NULL)
 
 all:
 
-cicNotationLexer.cmo: cicNotationLexer.ml
-	$(OCAMLC_P4) -c $<
-cicNotationLexer.cmx: cicNotationLexer.ml
-	$(OCAMLOPT_P4) -c $<
-cicNotationParser.cmo: cicNotationParser.ml
-	$(OCAMLC_P4) -c $<
-cicNotationParser.cmx: cicNotationParser.ml
-	$(OCAMLOPT_P4) -c $<
-
-%_notation.cmo: %_notation.ml
-	$(OCAMLC_P4) -c $<
-%_notation.cmx: %_notation.ml
-	$(OCAMLOPT_P4) -c $<
-
 LOCAL_LINKOPTS = -package helm-cic_notation -linkpkg
 test: test_lexer test_parser
 test_lexer: test_lexer.ml $(PACKAGE).cma
@@ -37,6 +27,13 @@ test_lexer: test_lexer.ml $(PACKAGE).cma
 test_parser: test_parser.ml $(PACKAGE).cma
 	$(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
 
+cicNotationLexer.cmo: OCAMLC = $(OCAMLC_P4)
+cicNotationParser.cmo: OCAMLC = $(OCAMLC_P4)
+cicNotationLexer.cmx: OCAMLOPT = $(OCAMLOPT_P4)
+cicNotationParser.cmx: OCAMLOPT = $(OCAMLOPT_P4)
+cicNotationParser.ml.annot: OCAMLC = $(OCAMLC_P4)
+cicNotationLexer.ml.annot: OCAMLC = $(OCAMLC_P4)
+
 clean: extra_clean
 distclean: extra_clean
 	rm -f macro_table.dump
@@ -46,10 +43,6 @@ extra_clean:
 include ../Makefile.common
 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 $<
+cicNotationParser.expanded.ml: cicNotationParser.ml
+	camlp4 -nolib '-I' '/usr/lib/ocaml/3.08.3/' '-I' '/home/zack/helm/ocaml/urimanager' '-I' '/usr/lib/ocaml/3.08.3/pcre' '-I' '/usr/lib/ocaml/3.08.3/' '-I' '/usr/lib/ocaml/3.08.3/netstring' '-I' '/usr/lib/ocaml/3.08.3/pxp-engine' '-I' '/usr/lib/ocaml/3.08.3/pxp-lex-utf8' '-I' '/usr/lib/ocaml/3.08.3/pxp-lex-iso88591' '-I' '/usr/lib/ocaml/3.08.3/pxp-lex-iso885915' '-I' '/usr/lib/ocaml/3.08.3/http' '-I' '/home/zacchiro/helm/ocaml/pxp' '-I' '/usr/lib/ocaml/3.08.3/zip' '-I' '/usr/lib/ocaml/3.08.3/expat' '-I' '/home/zacchiro/helm/ocaml/xml' '-I' '/home/zack/helm/ocaml/cic' '-I' '/usr/lib/ocaml/3.08.3/camlp4' '-I' '/home/zack/helm/ocaml/utf8_macros' '-I' '/usr/lib/ocaml/3.08.3/camlp4' '-I' '/usr/lib/ocaml/3.08.3/ulex' 'pa_o.cmo' 'pa_op.cmo' 'pr_o.cmo' 'pa_extend.cmo' 'pa_unicode_macro.cma' 'pa_ulex.cma'  $< > $@