docs: Serialize running apibuild.py

Use a witness file approach like we do for python/generator.py,
as suggested by Eric. Fixes the build issue reported here:

https://www.redhat.com/archives/libvir-list/2012-April/msg01435.html

Signed-off-by: Cole Robinson <crobinso@redhat.com>
(cherry picked from commit c964b6aac1c9d2fe02a814cbb1fddb8899656f50)

Conflicts:

	.gitignore - context with other commits not backported

diff --git a/.gitignore b/.gitignore
index 41fa50f5d280fabff0f57ed9d9a4d1eb79f53a3e..c7dc5e195e08476d7fd9b5a1ee69f98b6cd6a55c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@
 /configure
 /configure.lineno
 /daemon/*_dispatch.h
+/docs/apibuild.py.stamp
 /docs/hvsupport.html.in
 /docs/libvirt-qemu-*.xml
 /gnulib/lib/*

diff --git a/docs/Makefile.am b/docs/Makefile.am
index ac83e28151dc37e91af94aa705a8e9311406d3bf..c23bc134ffd6b3d5433de244d9f8ad33a977714c 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -187,12 +187,19 @@ python_generated_files = \
                $(srcdir)/libvirt-qemu-api.xml \
                $(srcdir)/libvirt-qemu-refs.xml
 
-$(python_generated_files): $(srcdir)/apibuild.py \
+APIBUILD="$(srcdir)/apibuild.py"
+APIBUILD_STAMP="$(APIBUILD).stamp"
+
+$(python_generated_files): $(APIBUILD_STAMP)
+
+$(APIBUILD_STAMP): $(srcdir)/apibuild.py \
                $(srcdir)/../include/libvirt/*.h \
                $(srcdir)/../src/libvirt.c \
                $(srcdir)/../src/libvirt-qemu.c \
                $(srcdir)/../src/util/virterror.c
-       $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/apibuild.py
+       $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD)
+       touch $@
+
 
 check-local: all
 
@@ -202,6 +209,7 @@ clean-local:
 maintainer-clean-local: clean-local
        rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in hvsupport.html.in
        rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
+       rm -rf $(APIBUILD_STAMP)
 
 rebuild: api qemu_api all