X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=ocaml%2FMakefile.am;h=d65ebaaf33b6895b182e5d580157e25325cbbd07;hp=ee42134b4ab5f244bfc8f7e469afaaa8d5f47596;hb=dc3d0e3b8ed8e77b1314f09d116ed97f6a440914;hpb=d19ceb226c242844467b2935c1e19b989b4315e8

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index ee42134..d65ebaa 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -18,40 +18,85 @@
 EXTRA_DIST = \
 	guestfs.mli guestfs.ml \
 	guestfs_c.c guestfs_c.h guestfs_c_actions.c \
-	.depend META.in
+	.depend META.in \
+	bindtests.ml \
+	run-bindtests \
+	t/*.ml
 
 SUBDIRS = examples
 
-CLEANFILES = *~
+CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
+CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
+
+AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
+  -I$(top_srcdir)/src -I$(top_builddir)/src
 
 if HAVE_OCAML
 
 noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
 
 mlguestfs.cma: guestfs_c.o guestfs_c_actions.o guestfs.cmo
-	$(OCAMLMKLIB) -o mlguestfs $^ -lguestfs
+	$(OCAMLMKLIB) -o mlguestfs $^ -L$(top_builddir)/src/.libs -lguestfs
 
 mlguestfs.cmxa: guestfs_c.o guestfs_c_actions.o guestfs.cmx
-	$(OCAMLMKLIB) -o mlguestfs $^ -lguestfs
+	$(OCAMLMKLIB) -o mlguestfs $^ -L$(top_builddir)/src/.libs -lguestfs
 
 guestfs_c.o: guestfs_c.c
-	$(CC) $(CFLAGS) -I$(OCAMLLIB) -I$(top_builddir)/src -fPIC -Wall -c $<
+	$(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
 
 guestfs_c_actions.o: guestfs_c_actions.c
-	$(CC) $(CFLAGS) -I$(OCAMLLIB) -I$(top_builddir)/src -fPIC -Wall -c $<
+	$(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
+
+TESTS_ENVIRONMENT = \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	$(VG)
+
+TESTS = run-bindtests \
+	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
+	t/guestfs_060_readdir
+noinst_DATA += bindtests \
+	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
+	t/guestfs_060_readdir
+
+bindtests: bindtests.cmx mlguestfs.cmxa
+	mkdir -p t
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
+
+t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
+	mkdir -p t
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
+
+t/guestfs_010_launch: t/guestfs_010_launch.cmx mlguestfs.cmxa
+	mkdir -p t
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
+
+t/guestfs_050_lvcreate: t/guestfs_050_lvcreate.cmx mlguestfs.cmxa
+	mkdir -p t
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
+
+t/guestfs_060_readdir: t/guestfs_060_readdir.cmx mlguestfs.cmxa
+	mkdir -p t
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . unix.cmxa mlguestfs.cmxa $< -o $@
+
+# Need to rebuild the tests from source if the main library has
+# changed at all, otherwise we get inconsistent assumptions.
+t/%.cmx: t/%.ml mlguestfs.cmxa
+	$(OCAMLFIND) ocamlopt -c $< -o $@
 
 .mli.cmi:
-	$(OCAMLFIND) ocamlc -c $<
+	$(OCAMLFIND) ocamlc -c $< -o $@
 .ml.cmo:
-	$(OCAMLFIND) ocamlc -c $<
+	$(OCAMLFIND) ocamlc -c $< -o $@
 .ml.cmx:
-	$(OCAMLFIND) ocamlopt -c $<
+	$(OCAMLFIND) ocamlopt -c $< -o $@
 
 depend: .depend
 
 .depend: $(wildcard *.mli) $(wildcard *.ml)
-	rm -f .depend
-	$(OCAMLFIND) ocamldep $^ > $@
+	rm -f $@ $@-t
+	$(OCAMLFIND) ocamldep $^ | sed 's/  *$$//' > $@-t
+	mv $@-t $@
 
 include .depend
 
@@ -66,4 +111,10 @@ install-data-hook:
 	  guestfs \
 	  META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli
 
-endif
\ No newline at end of file
+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: