[PATCH xorg-gtest 3/9] Build documentation if doxygen is available

Peter Hutterer peter.hutterer at who-t.net
Mon Jul 2 22:48:15 PDT 2012


Don't make it a separate build target, just build it.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 configure.ac    |    1 +
 doc/Makefile.am |    4 ++++
 2 files changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index 7d7b2e1..3dea940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.17)
 XORG_DEFAULT_OPTIONS
 XORG_ENABLE_INTEGRATION_TESTS([yes])
+XORG_WITH_DOXYGEN
 
 PKG_CHECK_MODULES(XSERVER, x11)
  
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 18ed073..94613a3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,6 +26,9 @@
 EXTRA_DIST = \
 	Doxyfile 
 
+if HAVE_DOXYGEN
+all-local: doc
+
 doc:
 	doxygen
 
@@ -38,6 +41,7 @@ install-data-local:
 		$(INSTALL) -d $(DESTDIR)$(mandir)/man3; \
 		$(INSTALL) api/man/man3/* $(DESTDIR)$(mandir)/man3; \
 	fi
+endif
 
 clean-local:
 	-rm -rf *.pdf *.html api
-- 
1.7.10.2



More information about the xorg-devel mailing list