ocaml 3.09 transition

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

diff --git a/helm/ocaml/metadata/Makefile b/helm/ocaml/metadata/Makefile
index 9d16a2c8da4eee6bf1529f273fd2c63f76e51d50..c876b48100ad7035929fa18c225df08ba194951e 100644 (file)
--- a/helm/ocaml/metadata/Makefile
+++ b/helm/ocaml/metadata/Makefile
@@ -1,8 +1,9 @@
 PACKAGE = metadata
-REQUIRES = mysql helm-cic_proof_checking
+REQUIRES = mysql helm-cic_proof_checking helm-hmysql
 PREDICATES =
 
 INTERFACE_FILES = \
+       sqlStatements.mli \
        metadataTypes.mli \
        metadataExtractor.mli \
        metadataPp.mli \
@@ -12,13 +13,26 @@ IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
 EXTRA_OBJECTS_TO_INSTALL =
 EXTRA_OBJECTS_TO_CLEAN =
 
-all:
+include ../Makefile.common
 
-test: test.ml $(PACKAGE).cma
-       $(OCAMLFIND) ocamlc -thread -package mysql,helm-metadata -linkpkg -o $@ $<
-test.opt: test.ml $(PACKAGE).cmxa
-       $(OCAMLFIND) opt -thread -package mysql,helm-metadata -linkpkg -o $@ $<
-test_query: test_query.ml $(PACKAGE).cma
-       $(OCAMLFIND) ocamlc -thread -package mysql,helm-metadata -linkpkg -o $@ $<
+all: all_table_creator all_extractor
+opt: opt_table_creator opt_extractor
 
-include ../Makefile.common
+all_table_creator:
+       make -C table_creator/ all
+opt_table_creator:
+       make -C table_creator/ opt
+
+all_extractor:
+       make -C extractor/ all
+opt_extractor:
+       make -C extractor/ opt
+
+clean: clean_table_creator clean_extractor
+
+clean_table_creator:
+       make -C table_creator/ clean
+       
+clean_extractor:
+       make -C extractor/ clean
+