[PATCH xserver 5/5] dmx/doc: alert builder when a tarball cannot be created

Gaetan Nadon memsize at videotron.ca
Wed Feb 10 11:10:31 PST 2010


When the html files cannot be doxygen generated, the makefile
target dist or distcheck will fail, as designed. Output a message
for the builder to figure out why this is happening, as it just
look like any other makefile failure.

Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 hw/dmx/doc/Makefile.am |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
index 048b6b2..6fd74e7 100644
--- a/hw/dmx/doc/Makefile.am
+++ b/hw/dmx/doc/Makefile.am
@@ -53,12 +53,13 @@ SUFFIXES = .sgml .txt .html .ps .pdf
 noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
 endif BUILD_LINUXDOC
+endif
 
-if HAVE_DOXYGEN
 DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
-
 all-local: html/annotated.html
 
+if ENABLE_DEVEL_DOCS
+if HAVE_DOXYGEN
 dist-local: html/annotated.html
 
 html/annotated.html: $(DOXYGEN_SRC)
@@ -67,8 +68,19 @@ html/annotated.html: $(DOXYGEN_SRC)
 maintainer-clean-local:
 	rm -rf html/
 
-endif HAVE_DOXYGEN
-endif ENABLE_DEVEL_DOCS
+else
+html/annotated.html: $(DOXYGEN_SRC)
+	@echo "*****";\
+	echo "The module configuration does not allow the creation of an archive file.";\
+	echo "Consider installing the doxygen tool or configuring xserver";\
+	echo "with --enable-doxygen";
+endif
+else 
+html/annotated.html: $(DOXYGEN_SRC)
+	@echo "*****";\
+	echo "The module configuration does not allow the creation of an archive file.";\
+	echo "Consider configuring xserver with --enable-devel-docs";
+endif
 
 EXTRA_DIST = \
 	$(SGML_FILES) \
-- 
1.6.0.4



More information about the xorg-devel mailing list