build: detect doc generation failure

Commit 8665f85 introduced a slight regression in doc generation,
since make only quits a rule on the first failed command ending
with a newline rather than a semicolon.

* docs/Makefile.am (html/index.html): Don't use xmllint unless
xsltproc succeeded.
* .gitignore: Ignore recently updated stamp file name.

diff --git a/.gitignore b/.gitignore
index 1bfb7b9bdeb8c02bb324d18e79506f3c1ad0506d..486e1028eae4364474787268f6c2a9e3e6533666 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@
 /mkinstalldirs
 /po/*
 /proxy/
+/python/generator.py.stamp
 /src/libvirt_iohelper
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4ba6b9d59d39c2412f7935fa7984326b54c9e40f..de649fe5c96d28dfcd7bd69f2b2e1897a0a32fa3 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -155,7 +155,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
        $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
          $(XSLTPROC) --nonet -o $(srcdir)/ \
-         $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi ; \
+         $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \
        if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
          if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \
            > /dev/null ; then \