X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml%2FMakefile.am;h=e80d44a35814cb4fcf42f78075183800b3061c90;hb=2fbac04b9de826fb49400a1fc7a97262b76d078e;hp=38238f6933e85118c2e1cbb14e066926e6bab430;hpb=2e2eb15df010bbcc605c86b0714ad1ca796fc96d;p=libguestfs.git

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 38238f6..e80d44a 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -20,15 +20,12 @@ include $(top_srcdir)/subdir-rules.mk
 generator_built = \
 	guestfs.mli \
 	guestfs.ml \
-	guestfs_inspector.mli \
-	guestfs_inspector.ml \
 	guestfs_c_actions.c \
 	bindtests.ml
 
 EXTRA_DIST = \
 	$(generator_built) \
 	guestfs_c.c guestfs_c.h \
-	guestfs_inspector.mli guestfs_inspector.ml \
 	.depend META.in \
 	run-bindtests \
 	t/*.ml
@@ -45,7 +42,7 @@ if HAVE_XML_LIGHT
 
 noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
 
-OBJS = guestfs_c.o guestfs_c_actions.o guestfs.cmo guestfs_inspector.cmo
+OBJS = guestfs_c.o guestfs_c_actions.o guestfs.cmo
 XOBJS = $(OBJS:.cmo=.cmx)
 
 mlguestfs.cma: $(OBJS)
@@ -67,10 +64,12 @@ TESTS_ENVIRONMENT = \
 
 TESTS = run-bindtests \
 	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
-	t/guestfs_060_readdir t/guestfs_500_inspect
+	t/guestfs_060_readdir t/guestfs_070_threads \
+	t/guestfs_400_progress
 noinst_DATA += bindtests \
 	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
-	t/guestfs_060_readdir t/guestfs_500_inspect
+	t/guestfs_060_readdir t/guestfs_070_threads \
+	t/guestfs_400_progress
 
 bindtests: bindtests.cmx mlguestfs.cmxa
 	mkdir -p t
@@ -92,12 +91,19 @@ t/guestfs_060_readdir: t/guestfs_060_readdir.cmx mlguestfs.cmxa
 	mkdir -p t
 	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@
 
-t/guestfs_500_inspect: t/guestfs_500_inspect.cmx mlguestfs.cmxa
+t/guestfs_070_threads: t/guestfs_070_threads.cmx mlguestfs.cmxa
+	mkdir -p t
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa $< -o $@
+
+t/guestfs_400_progress: t/guestfs_400_progress.cmx mlguestfs.cmxa
 	mkdir -p t
 	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package xml-light,unix -linkpkg mlguestfs.cmxa $< -o $@
 
 # Need to rebuild the tests from source if the main library has
 # changed at all, otherwise we get inconsistent assumptions.
+t/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa
+	$(OCAMLFIND) ocamlopt -package unix,threads -thread -linkpkg -c $< -o $@
+
 t/%.cmx: t/%.ml mlguestfs.cmxa
 	$(OCAMLFIND) ocamlopt -package xml-light,unix -linkpkg -c $< -o $@