X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=ocaml%2FMakefile.am;h=cb4ad347c3e054c7742f492ce7a2aea59aa7887e;hp=760caf623602afe89fde330e4f7dca181aa86fdd;hb=ad8a256f54a6cb99f89bb444c8597a152a793dce;hpb=6b668620681ada82857e09922a0feb004ee65882

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 760caf6..cb4ad34 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -19,6 +19,8 @@ EXTRA_DIST = \
 	guestfs.mli guestfs.ml \
 	guestfs_c.c guestfs_c.h guestfs_c_actions.c \
 	.depend META.in \
+	bindtests.ml \
+	run-bindtests \
 	t/*.ml
 
 SUBDIRS = examples
@@ -44,11 +46,16 @@ guestfs_c_actions.o: guestfs_c_actions.c
 
 TESTS_ENVIRONMENT = \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
-	LIBGUESTFS_PATH=$(top_builddir) \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
 	$(VG)
 
-TESTS = t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate
-noinst_DATA += $(TESTS)
+TESTS = run-bindtests \
+	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate
+noinst_DATA += bindtests \
+	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate
+
+bindtests: bindtests.ml mlguestfs.cmxa
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
 
 t/guestfs_005_load: t/guestfs_005_load.ml mlguestfs.cmxa
 	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
@@ -88,3 +95,7 @@ install-data-hook:
 CLEANFILES += $(noinst_DATA)
 
 endif
+
+# Tell version 3.79 and up of GNU make to not build goals in this
+# directory in parallel.  (Possible solution for RHBZ#502309).
+.NOTPARALLEL: