X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml%2FMakefile.am;h=b9451e315d896a69702a4b0bce92b79af4a9c9c5;hb=46bdd955670a5a6b29a6e4ec7d3c63d37f853a92;hp=f7d26ced1e3c8c9fa519d50d69d6f843568bac55;hpb=aa5d6c138b55e25994ac723e94f32b009366927c;p=hivex.git

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index f7d26ce..b9451e3 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -46,15 +46,46 @@ hivex_c.o: hivex_c.c
 	$(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
 
 TESTS_ENVIRONMENT = \
-	LD_LIBRARY_PATH=$(top_builddir)/lib/.libs \
+	LD_LIBRARY_PATH=$(top_builddir)/lib/.libs:$(top_builddir)/ocaml \
 	$(VG)
 
-TESTS = t/hivex_005_load
+TESTS = \
+	t/hivex_005_load \
+	t/hivex_010_open \
+	t/hivex_020_root \
+	t/hivex_100_errors \
+	t/hivex_110_gc_handle \
+	t/hivex_200_write \
+	t/hivex_300_fold
 noinst_DATA += $(TESTS)
 
-t/hivex_005_load: t/hivex_005_load.cmx mlhivex.cmxa
+t/hivex_005_load: t/hivex_005_load.cmo mlhivex.cma
 	mkdir -p t
-	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@
+	$(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
+
+t/hivex_010_open: t/hivex_010_open.cmo mlhivex.cma
+	mkdir -p t
+	$(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
+
+t/hivex_020_root: t/hivex_020_root.cmo mlhivex.cma
+	mkdir -p t
+	$(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
+
+t/hivex_100_errors: t/hivex_100_errors.cmo mlhivex.cma
+	mkdir -p t
+	$(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
+
+t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmo mlhivex.cma
+	mkdir -p t
+	$(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
+
+t/hivex_200_write: t/hivex_200_write.cmo mlhivex.cma
+	mkdir -p t
+	$(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
+
+t/hivex_300_fold: t/hivex_300_fold.cmo mlhivex.cma
+	mkdir -p t
+	$(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
 
 # Need to rebuild the tests from source if the main library has
 # changed at all, otherwise we get inconsistent assumptions.