From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 4 Apr 2012 11:26:04 +0000 (+0100)
Subject: Fix parallel build in docs/ directory
X-Git-Tag: v0.9.6.1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abb78a216cfac93a79da201fd39dcb9e0c1098c6;p=thirdparty%2Flibvirt.git

Fix parallel build in docs/ directory

Every now & then, with parallel builds, we get a failure to
validate hvsupport.html.in.  I eventually noticed that this
is because we get 2 instances of the generator running at
once.

We already list hvsupport.html.in in BUILT_SOURCES but this
was not working. It turns out the flaw is that we were
adding deps to the 'all:' target instead of the 'all-am:'
target. BUILT_SOURCES is a dep of 'all', so any custom
targets written in Makefile.am must use 'all-am:' so that
they don't get run until BUILT_SOURCES are completely
generated

* docs/Makefile.am: s/all/all-am/
(cherry picked from commit 4f4b496e782dd20d105b89f89e07288772555346)
(cherry picked from commit 26fdec39b43d886948796b88fabc11beb967ef66)
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 0b8f2269dc..ac83e28151 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -103,7 +103,7 @@ MAINTAINERCLEANFILES = \
   $(addprefix $(srcdir)/,$(apihtml)) \
   $(addprefix $(srcdir)/,$(devhelphtml))
 
-all: web
+all-am: web
 
 api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml
 qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml