[PATCH xserver] dmx: only conditionnaly distribute html files

Gaetan Nadon memsize at videotron.ca
Sat Jan 9 08:53:24 PST 2010


When building of docs is disabled (the default) the
distribution of the doc output must be as well.
Otherwise the make dist target fails.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 hw/dmx/doc/Makefile.am |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
index 0fb6e89..601205a 100644
--- a/hw/dmx/doc/Makefile.am
+++ b/hw/dmx/doc/Makefile.am
@@ -75,7 +75,10 @@ EXTRA_DIST = \
 	doxygen.css \
 	doxygen.foot \
 	doxygen.head \
-	scaled.txt \
+	scaled.txt
+
+if BUILDDOCS
+EXTRA_DIST += \
 	html/annotated.html \
 	html/ChkNotMaskEv_8c.html \
 	html/ChkNotMaskEv_8h.html \
@@ -278,6 +281,7 @@ EXTRA_DIST = \
 	html/usb-other_8h_source.html \
 	html/usb-private_8h.html \
 	html/usb-private_8h_source.html
+endif
 
 $(builddir)/doxygen.head:
 	$(LN_S) $(srcdir)/doxygen.head $@
-- 
1.6.0.4

Initial post for review
Building the docs is disabled by default. This is implemented in the parent Makefile
by not visiting the doc subdir. When assembling the tarball, the doc subdir is visisted
so the html files must not be included as they have not been generated.




More information about the xorg-devel mailing list