[libvirt] [PATCH 2/7] qemu_api: Update Makefile for subdir docs

[Daniel Veillard]

On Fri, Sep 09, 2011 at 07:24:42PM +0800, Osier Yang wrote:
> ---
>  docs/Makefile.am |   19 +++++++++++++++----
>  1 files changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git a/docs/Makefile.am b/docs/Makefile.am
> index 50a199f..70ec6f9 100644
> --- a/docs/Makefile.am
> +++ b/docs/Makefile.am
[...]
>  
>  api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml
> +qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
>  
>  web: $(dot_html) html/index.html devhelp/index.html
>  
> @@ -172,15 +179,18 @@ $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)
>  	  $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \
>  	  $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi
>  
> +
>  python_generated_files = \
>  		$(srcdir)/html/libvirt-libvirt.html \
> +		$(srcdir)/html/libvirt-libvirt-qemu.html \
>  		$(srcdir)/html/libvirt-virterror.html \
> -		$(srcdir)/libvirt-api.xml \
> -		$(srcdir)/libvirt-refs.xml
> +		$(api) \
> +		$(qemu_api)

  Unfortunately that does not work !
Without expanding the names of the fiels with the $(srcdir)/ prefix,
built failed for me, so please merge in the following diff before commit
otherwise fine, ACK,

Daniel

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 70ec6f9..0eb69b2 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -184,8 +184,10 @@ python_generated_files = \
 		$(srcdir)/html/libvirt-libvirt.html \
 		$(srcdir)/html/libvirt-libvirt-qemu.html \
 		$(srcdir)/html/libvirt-virterror.html \
-		$(api) \
-		$(qemu_api)
+		$(srcdir)/libvirt-api.xml \
+		$(srcdir)/libvirt-refs.xml \
+		$(srcdir)/libvirt-qemu-api.xml \
+		$(srcdir)/libvirt-qemu-refs.xml
 
 $(python_generated_files): $(srcdir)/apibuild.py \
 		$(srcdir)/../include/libvirt/*.h \

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/