xserver: Branch 'master'

[Keith Packard]

 hw/dmx/doc/Makefile.am |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 26f4d8a2c12ff06c4beb06842cd8d9c0d9ddd4aa
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Oct 22 01:04:42 2009 +0900

    Make sure dmx docs are built for distribution.
    
    Ok, dmx docs are driving me slightly nuts. We probably shouldn't
    include the built versions in the tarball, but we do, so this is an
    attempt to make that work by having both the 'all' and 'dist' targets
    depends on the doxygen output.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
index 2f5e7ac..0fb6e89 100644
--- a/hw/dmx/doc/Makefile.am
+++ b/hw/dmx/doc/Makefile.am
@@ -52,8 +52,15 @@ CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 endif
 
 if HAVE_DOXYGEN
-all-local:
-	$(DOXYGEN) doxygen.conf
+
+DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
+
+all-local: html/annotated.html
+
+dist-local: html/annotated.html
+
+html/annotated.html: $(DOXYGEN_SRC)
+	$(DOXYGEN) $(srcdir)/doxygen.conf
 
 clean-local:
 	rm -rf html/
@@ -271,3 +278,13 @@ EXTRA_DIST = \
 	html/usb-other_8h_source.html \
 	html/usb-private_8h.html \
 	html/usb-private_8h_source.html
+
+$(builddir)/doxygen.head:
+	$(LN_S) $(srcdir)/doxygen.head $@
+
+$(builddir)/doxygen.foot:
+	$(LN_S) $(srcdir)/doxygen.foot $@
+
+$(builddir)doxygen.css:
+	$(LN_S) $(srcdir)/doxygen.css $@
+