added support for cic_textual_parser2 module

diff --git a/helm/ocaml/.cvsignore b/helm/ocaml/.cvsignore
index 3a94cf124328e5e32b698804a3983a10119f968d..5d79f6bc0b7e5b05f1baf51c83b5f88cc90f5edb 100644 (file)
--- a/helm/ocaml/.cvsignore
+++ b/helm/ocaml/.cvsignore
@@ -5,6 +5,7 @@ META.helm-cic_cache
 META.helm-cic_proof_checking
 META.helm-tex_cic_textual_parser
 META.helm-cic_textual_parser
+META.helm-cic_textual_parser2
 META.helm-cic_unification
 META.helm-getter
 META.helm-mathql

diff --git a/helm/ocaml/META.helm-cic_textual_parser2.src b/helm/ocaml/META.helm-cic_textual_parser2.src
new file mode 100644 (file)
index 0000000..043a289
--- /dev/null
+++ b/helm/ocaml/META.helm-cic_textual_parser2.src
@@ -0,0 +1,5 @@
+requires="helm-cic"
+version="0.0.1"
+archive(byte)="cic_textual_parser2.cma"
+archive(native)="cic_textual_parser2.cmxa"
+linkopts="-I +camlp4 gramlib.cma"

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 47d02bb42867c70452ca921eb451bf96ff4d26f6..7d9c56d6f126a6fee8eb84f9f668d736d9932da3 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -10,10 +10,12 @@
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep -pp camlp4o
+PREPROCOPTIONS = -pp camlp4o
+PREREQ =
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLDEP = ocamlfind ocamldep $(PREPROCOPTIONS)
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
@@ -29,13 +31,14 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
-       $(OCAMLC) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
+       $(OCAMLC) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
-       $(OCAMLOPT) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
+       $(OCAMLOPT) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
 
-all: $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
-opt: $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
+prereq: $(PREREQ)
+all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
+opt: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
 
 depend: $(DEPEND_FILES)
        $(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index c0ef52ff8c53209f3e1dfa0fb75217316642a3d3..c53a83b5a660cd9d963d733ff429505585505ebb 100644 (file)
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -1,6 +1,7 @@
 # Warning: the modules must be in compilation order
 MODULES = xml urimanager getter pxp cic cic_annotations cic_annotations_cache \
           cic_cache cic_proof_checking cic_textual_parser \
+         cic_textual_parser2 \
           tex_cic_textual_parser cic_unification mathql mathql_generator \
          mathql_interpreter cic_omdoc tactics cic_transformations