From: Jim Meyering <meyering@redhat.com>
Date: Mon, 5 Oct 2009 10:25:15 +0000 (+0200)
Subject: build: avoid parallel ocaml/... build failure
X-Git-Tag: 1.0.73~3
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=c6b8db6493dd633bf48b13daf72cdc9c078b5f9a;p=libguestfs.git

build: avoid parallel ocaml/... build failure

A parallel build could fail due to the use in ocaml/examples
of ocaml/guestfs.cmi before it was built.
* Makefile.am (SUBDIRS): Add both ocaml and ocaml/examples,
to ensure they're built in this order, and not in parallel.
* ocaml/Makefile.am (SUBDIRS): Don't define.
---

diff --git a/Makefile.am b/Makefile.am
index fce4af2..90c51f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
 	gnulib/tests capitests regressions test-tool
 
 if HAVE_OCAML
-SUBDIRS += ocaml
+SUBDIRS += ocaml ocaml/examples
 endif
 if HAVE_PERL
 SUBDIRS += perl
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 462404c..c89296b 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -23,8 +23,6 @@ EXTRA_DIST = \
 	run-bindtests \
 	t/*.ml
 
-SUBDIRS = examples
-
 CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
 CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so