X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2Fmetadata%2FMakefile;h=d02d021a5b3844e6137924de968e3f26be100f8f;hb=c4eec8df32b6b004e76cbce54342385d3bf25fa5;hp=52fe27edd79b0e40ebab812bcf6b31c4723237f8;hpb=a268d7377c1d4ddae4229f5844125f827325c78a;p=helm.git

diff --git a/helm/ocaml/metadata/Makefile b/helm/ocaml/metadata/Makefile
index 52fe27edd..d02d021a5 100644
--- a/helm/ocaml/metadata/Makefile
+++ b/helm/ocaml/metadata/Makefile
@@ -1,5 +1,4 @@
 PACKAGE = metadata
-REQUIRES = mysql helm-cic_proof_checking
 PREDICATES =
 
 INTERFACE_FILES = \
@@ -13,25 +12,29 @@ IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
 EXTRA_OBJECTS_TO_INSTALL =
 EXTRA_OBJECTS_TO_CLEAN =
 
+include ../../Makefile.defs
 include ../Makefile.common
 
-all: all_table_creator
-opt: opt_table_creator
+all: all_table_creator all_extractor
+opt: opt_table_creator opt_extractor
 
 all_table_creator:
-	make -C table_creator/ all
+	@make -C table_creator/ all 
 opt_table_creator:
-	make -C table_creator/ opt
+	@make -C table_creator/ opt
 
-clean: clean_table_creator
+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
+	@echo "  cleaning: table_creator"
+	@make -C table_creator/ clean 
+	
+clean_extractor:
+	@echo "  cleaning: extractor"
+	@make -C extractor/ clean
 	
-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 $@ $<
-