build: fix regression with libvirt-api.xml generation

(EXTRA_DIST): Remove redundant listing of xml files.
(html/%-%.html, html/%-virterror.html, %-api.xml, %-refs.xml):
Rewrite with...
(python_generated_files): ...new macro, since make didn't see
through the dependency chain correctly otherwise.

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 41068c622524f327e58ac0676297025587714998..c01e085d10d00546ca90e9181963ba2606ce16c4 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -70,8 +70,8 @@ fig = \
   libvirt-object-model.fig
 
 EXTRA_DIST=                                    \
-  libvirt-api.xml libvirt-refs.xml apibuild.py \
-  site.xsl newapi.xsl news.xsl page.xsl        ChangeLog.xsl   \
+  apibuild.py \
+  site.xsl newapi.xsl news.xsl page.xsl ChangeLog.xsl \
   $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
   $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
   $(xml) $(fig) $(png) \
@@ -129,19 +129,23 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
          $(XMLLINT) --nonet --valid --noout html/*.html ; \
          else echo "missing XHTML1 DTD" ; fi ; fi
 
-$(devhelphtml): libvirt-api.xml $(devhelpxsl)
+$(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)
        -@echo Rebuilding devhelp files
        -@if [ -x $(XSLTPROC) ] ; then \
          $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \
          $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi
 
-html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: $(srcdir)/apibuild.py
-       -srcdir=$(srcdir) $(srcdir)/apibuild.py
+python_generated_files = \
+               $(srcdir)/html/libvirt-libvirt.html \
+               $(srcdir)/html/libvirt-virterror.html \
+               $(srcdir)/libvirt-api.xml \
+               $(srcdir)/libvirt-refs.xml
 
-html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: \
-               $(srcdir)/../include/%/*.h \
-               $(srcdir)/../src/%.c \
+$(python_generated_files): $(srcdir)/apibuild.py \
+               $(srcdir)/../include/libvirt/*.h \
+               $(srcdir)/../src/libvirt.c \
                $(srcdir)/../src/util/virterror.c
+       -srcdir=$(srcdir) $(srcdir)/apibuild.py
 
 check-local: all