first moogle template checkin

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

diff --git a/helm/ocaml/cic_disambiguation/Makefile b/helm/ocaml/cic_disambiguation/Makefile
index ea516c526930d5c4144ab0ccdac8477861f1e2af..932008160ac3e0ab045b91a608322e23782ce34c 100644 (file)
--- a/helm/ocaml/cic_disambiguation/Makefile
+++ b/helm/ocaml/cic_disambiguation/Makefile
@@ -1,10 +1,10 @@
 
 PACKAGE = cic_textual_parser2
 REQUIRES = \
-       helm-tactics helm-logger helm-cic_unification helm-cic_transformations \
-       ulex pxp camlp4.gramlib
-# NOTATIONS = logic arit tex
-NOTATIONS = logic arit
+       helm-tactics helm-logger helm-cic_unification helm-cic_transformations helm-pxp \
+       ulex camlp4.gramlib
+NOTATIONS = logic arit tex
+# NOTATIONS = logic arit
 INTERFACE_FILES = \
        disambiguateTypes.mli \
        disambiguateChoices.mli \
@@ -55,7 +55,7 @@ test_lexer: test_lexer.ml $(PACKAGE).cma
 test_parser: test_parser.ml $(PACKAGE).cma
        $(OCAMLC) $(LOCAL_LINKOPTS) -o $@ $<
 make_table: make_table.ml
-       $(OCAMLFIND) ocamlc -package pxp -linkpkg -o $@ $^
+       $(OCAMLFIND) ocamlc -package helm-pxp -linkpkg -o $@ $^
 
 macro_table.ml: make_table
        ./make_table $@
@@ -69,6 +69,7 @@ extra_clean:
        rm -f test_lexer test_parser make_table
 
 include ../Makefile.common
+OCAMLARCHIVEOPTIONS += -linkall
 
 .PHONY: depend
 depend: cicTextualParser2Macro.cmi cicTextualParser2Macro.cmo pa_unicode_macro.cmi pa_unicode_macro.cmo