ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_notation / Makefile

diff --git a/helm/ocaml/cic_notation/Makefile b/helm/ocaml/cic_notation/Makefile
index 5c3b094087d8f08dcd123b249dba5f8dcc1175df..cfd1ad505d61ec46a0d4bca013ad52b0c4e06056 100644 (file)
--- a/helm/ocaml/cic_notation/Makefile
+++ b/helm/ocaml/cic_notation/Makefile
@@ -1,38 +1,64 @@
 
 PACKAGE = cic_notation
-REQUIRES = \
-       helm-cic        \
-       helm-utf8_macros \
-       ulex
 NULL =
+REQUIRES = \
+       helm-cic                \
+       helm-utf8_macros        \
+       camlp4.gramlib          \
+       helm-cic_proof_checking \
+       ulex                    \
+       $(NULL)
 INTERFACE_FILES = \
+       renderingAttrs.mli      \
+       cicNotationUtil.mli     \
+       cicNotationTag.mli      \
        cicNotationLexer.mli    \
+       cicNotationEnv.mli      \
+       cicNotationPp.mli       \
+       grafiteAstPp.mli        \
+       cicNotationMatcher.mli  \
+       cicNotationFwd.mli      \
+       cicNotationRew.mli      \
        cicNotationParser.mli   \
+       grafiteParser.mli       \
+       mpresentation.mli       \
+       box.mli                 \
+       cicNotationPres.mli     \
+       boxPp.mli               \
+       cicNotation.mli         \
        $(NULL)
 IMPLEMENTATION_FILES = \
        cicNotationPt.ml        \
+       grafiteAst.ml           \
        $(patsubst %.mli, %.ml, $(INTERFACE_FILES))     \
        $(NULL)
 
-all:
-
-cicNotationLexer.cmo: cicNotationLexer.ml cicNotationLexer.cmi
-       $(OCAMLC_P4) -c $<
-cicNotationLexer.cmx: cicNotationLexer.ml cicNotationLexer.cmi
-       $(OCAMLOPT_P4) -c $<
-cicNotationParser.cmo: REQUIRES = helm-utf8_macros camlp4.gramlib helm-cic
-cicNotationParser.cmo: cicNotationParser.ml cicNotationParser.cmi cicNotationLexer.cmi
-       $(OCAMLC_P4) -c $<
-cicNotationParser.cmx: REQUIRES = helm-utf8_macros camlp4.gramlib
-cicNotationParser.cmx: cicNotationParser.ml cicNotationParser.cmi cicNotationLexer.cmi
-       $(OCAMLOPT_P4) -c $<
+all: test_lexer test_parser test_dep print_grammar
 
 LOCAL_LINKOPTS = -package helm-cic_notation -linkpkg
-test: test_lexer test_parser
+test: test_lexer test_parser test_dep
 test_lexer: test_lexer.ml $(PACKAGE).cma
        $(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
+test_parser: REQUIRES += helm-cic_omdoc
 test_parser: test_parser.ml $(PACKAGE).cma
        $(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
+test_dep: test_dep.ml $(PACKAGE).cma
+       $(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
+print_grammar: print_grammar.ml $(PACKAGE).cma
+       $(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
+
+cicNotationLexer.cmo: OCAMLC = $(OCAMLC_P4)
+cicNotationParser.cmo: OCAMLC = $(OCAMLC_P4)
+grafiteParser.cmo: OCAMLC = $(OCAMLC_P4)
+cicNotationLexer.cmx: OCAMLOPT = $(OCAMLOPT_P4)
+cicNotationParser.cmx: OCAMLOPT = $(OCAMLOPT_P4)
+grafiteParser.cmx: OCAMLOPT = $(OCAMLOPT_P4)
+cicNotationParser.ml.annot: OCAMLC = $(OCAMLC_P4)
+grafiteParser.ml.annot: OCAMLC = $(OCAMLC_P4)
+cicNotationLexer.ml.annot: OCAMLC = $(OCAMLC_P4)
+cicNotationPres.cmi: OCAMLOPTIONS += -rectypes
+cicNotationPres.cmo: OCAMLOPTIONS += -rectypes
+cicNotationPres.cmx: OCAMLOPTIONS += -rectypes
 
 clean: extra_clean
 distclean: extra_clean
@@ -43,10 +69,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'  $< > $@