[libvirt] [PATCH] Separate objdir build fixes

john.levon at sun.com john.levon at sun.com
Wed Jan 14 15:22:47 UTC 2009


# HG changeset patch
# User John Levon <john.levon at sun.com>
# Date 1231946129 28800
# Node ID b614f5780261464e8f10e48306e67d43d56931b0
# Parent  53c621a65055f4752abef748c0ad15cbb1d8013d
Separate objdir build fixes

Let devhelp build in a separate objdir.

Signed-off-by: John Levon <john.levon at sun.com>

diff --git a/docs/devhelp/Makefile.am b/docs/devhelp/Makefile.am
--- a/docs/devhelp/Makefile.am
+++ b/docs/devhelp/Makefile.am
@@ -1,7 +1,8 @@ DEVHELP_DIR=$(datadir)/gtk-doc/html/libv
 DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
 HTML_FILES=index.html general.html $(HTML_MODULES)
 HTML_MODULES=				\
-	libvirt-libvirt.html
+	libvirt-libvirt.html		\
+	libvirt-virterror.html
 
 EXTRA_FORMAT=				\
 	home.png			\
@@ -17,11 +18,12 @@ libvirt.devhelp $(HTML_FILES): $(srcdir)
 libvirt.devhelp $(HTML_FILES): $(srcdir)/devhelp.xsl html.xsl $(top_srcdir)/docs/libvirt-api.xml
 	-@(echo Rebuilding devhelp files)
 	-@(if [ -x $(XSLTPROC) ] ; then \
-	  $(XSLTPROC) --nonet -o $(srcdir)/libvirt.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/docs/libvirt-api.xml ; fi );
+	  $(XSLTPROC) --nonet -o libvirt.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/docs/libvirt-api.xml ; fi );
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR)
 	- at INSTALL@ -m 0644 libvirt.devhelp $(DESTDIR)$(DEVHELP_DIR)
-	- at INSTALL@ -m 0644 $(EXTRA_FORMAT) $(DESTDIR)$(DEVHELP_DIR)
 	- at INSTALL@ -m 0644 $(HTML_FILES) $(DESTDIR)$(DEVHELP_DIR)
-
+	-for file in $(EXTRA_FORMAT); do \
+	    @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
+	done




More information about the libvir-list mailing list