Libguestfs - Nov 2009 - [PATCH] Add missing dependencies for targets of generator.ml

Parallel make was failing because guestfs-structs.h was required before
generator.ml ran.
---
 src/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 469f6d6..ae10ed8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,8 +34,6 @@ stamp-generator: generator.ml
 	mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
 	cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
 
-guestfs_protocol.x: stamp-generator
-
 include_HEADERS = guestfs.h guestfs-actions.h guestfs-structs.h
 
 lib_LTLIBRARIES = libguestfs.la
@@ -49,6 +47,8 @@ BUILT_SOURCES = \
   guestfs-actions.c \
   guestfs-bindtests.c
 
+$(BUILT_SOURCES): stamp-generator
+
 # This convenience library is solely to avoid compiler warnings
 # in its generated sources.
 libprotocol_la_SOURCES = \
-- 
1.6.5.2

On Wed, Nov 18, 2009 at 01:41:13PM +0000, Matthew Booth
wrote:
> Parallel make was failing because guestfs-structs.h was required before
> generator.ml ran.
Unfortunately this patch fully reverts:

http://git.annexia.org/?p=libguestfs.git;a=commitdiff;h=efad4f53923dcca94613e193d6383bd032e70498

which was necessary to stop the generator being rerun all the time.
I'd prefer one where we just specify the files that are necessary.  Or
a more detailed analysis of why every single $(BUILT_SOURCES) file is
really necessary here.

See also:

http://git.annexia.org/?p=libguestfs.git;a=commitdiff;h=a6832406fabf251ba89ed91a9f23624fa16f977f

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/