Let devhelp build in a separate objdir.

diff --git a/ChangeLog b/ChangeLog
index 9abb15d3bed82a7c57d2a75ef8b912d312a9b78b..bbefe231297945413b697495efb5263297eba432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 14 17:25:38 GMT 2009  John Levon  <levon@movementarian.org>
+
+       * docs/devhelp/Makefile.am: Let devhelp build in a separate objdir.
+
 Wed Jan 14 16:21:47 GMT 2009  John Levon  <levon@movementarian.org>
 
        * docs/Makefile.am:

diff --git a/docs/devhelp/Makefile.am b/docs/devhelp/Makefile.am
index 53c87fae4162754294a5f4cdbffc4b9cd667e118..0299ab45349fe127f2a3d2489428cc65c36cf46f 100644 (file)
--- a/docs/devhelp/Makefile.am
+++ b/docs/devhelp/Makefile.am
@@ -1,7 +1,8 @@
 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 @@ all: libvirt.devhelp $(HTML_FILES)
 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)
        -@INSTALL@ -m 0644 libvirt.devhelp $(DESTDIR)$(DEVHELP_DIR)
-       -@INSTALL@ -m 0644 $(EXTRA_FORMAT) $(DESTDIR)$(DEVHELP_DIR)
        -@INSTALL@ -m 0644 $(HTML_FILES) $(DESTDIR)$(DEVHELP_DIR)
-
+       -for file in $(EXTRA_FORMAT); do \
+           @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
+       done