X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.common.in;h=0bae0213f41ac8f2d0eee622a00110167351f37f;hb=b2ebb6109cdb9d2aabc28b32dbfa78288b67b1ac;hp=81a84e42caccf7dffe0cd16cbd26c5ee042891d9;hpb=223e208e2b0c432d9c5c1aef91ca6114cf97933b;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 81a84e42c..0bae0213f 100644
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -19,7 +19,7 @@ OCAMLARCHIVEOPTIONS =
 OCAMLFIND = @OCAMLFIND@
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLDEP = $(OCAMLFIND) ocamldep -package "$(REQUIRES)" $(SYNTAXOPTIONS)
+OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4,$(REQUIRES)" $(SYNTAXOPTIONS)
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
@@ -49,6 +49,10 @@ prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
 opt: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
 world: all opt
+test: test.ml $(ARCHIVE)
+	$(OCAMLC) $(ARCHIVE) -linkpkg -o $@ $<
+test.opt: test.ml $(ARCHIVE_OPT)
+	$(OCAMLOPT) $(ARCHIVE_OPT) -linkpkg -o $@ $<
 
 depend: $(DEPEND_FILES)
 	$(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
@@ -65,6 +69,8 @@ $(PACKAGE).ps: .dep.dot
 	$(OCAMLC) -c $<
 %.cmx: %.ml
 	$(OCAMLOPT) -c $<
+%.annot: %.ml
+	$(OCAMLC) -dtypes $(PKGS) -c $<
 %.ml %.mli: %.mly
 	$(OCAMLYACC) $<
 %.ml: %.mll
@@ -75,6 +81,8 @@ $(IMPLEMENTATION_FILES:%.ml=%.cmx): $(LIBRARIES_OPT)
 
 clean:
 	rm -f *.cm[ioax] *.cmxa *.o *.a $(EXTRA_OBJECTS_TO_CLEAN)
+	if [ -f test ]; then rm -f test; else true; fi
+	if [ -f test.opt ]; then rm -f test.opt; else true; fi
 
 install:
 	mkdir $(OCAMLFIND_DEST_DIR)/$(PACKAGE)