[PATCH xorg-docs] Implement the --disable-docs option

Gaetan Nadon memsize at videotron.ca
Sun Nov 7 07:42:54 PST 2010


The XORG_ENABLE_DOCS macro provide a configure option to
disable the generation of general documentation.

The makefiles need to use the Automake conditional ENABLE_DOCS

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---

I am aware this could have been done in the /general makefile alone,
but it would be misleading when looking at the leaf makefile out of context.

 general/Makefile.am           |    5 ++++-
 general/fonts/Makefile.am     |    4 +++-
 general/graphics/Makefile.am  |    4 +++-
 general/input/Makefile.am     |    4 +++-
 general/platforms/Makefile.am |    4 +++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/general/Makefile.am b/general/Makefile.am
index e9731cb..70f7474 100644
--- a/general/Makefile.am
+++ b/general/Makefile.am
@@ -1,7 +1,8 @@
-#  Process this file with automake to create Makefile.in
 
 SUBDIRS = fonts input graphics platforms
 
+if ENABLE_DOCS
+
 doc_sources = \
 	License.xml \
 	README.xml \
@@ -12,3 +13,5 @@ xmldir = $(docdir)
 dist_xml_DATA = $(doc_sources)
 
 include $(top_srcdir)/xmlrules.in
+
+endif ENABLE_DOCS
diff --git a/general/fonts/Makefile.am b/general/fonts/Makefile.am
index 8c98b66..57f9bd2 100644
--- a/general/fonts/Makefile.am
+++ b/general/fonts/Makefile.am
@@ -1,4 +1,4 @@
-#  Process this file with automake to create Makefile.in
+if ENABLE_DOCS
 
 doc_sources = fonts.xml
 
@@ -6,3 +6,5 @@ xmldir = $(docdir)/fonts
 dist_xml_DATA = $(doc_sources)
 
 include $(top_srcdir)/xmlrules.in
+
+endif ENABLE_DOCS
diff --git a/general/graphics/Makefile.am b/general/graphics/Makefile.am
index 55d3d88..542f12c 100644
--- a/general/graphics/Makefile.am
+++ b/general/graphics/Makefile.am
@@ -1,4 +1,4 @@
-#  Process this file with automake to create Makefile.in
+if ENABLE_DOCS
 
 doc_sources = dps.xml
 
@@ -6,3 +6,5 @@ xmldir = $(docdir)/graphics
 dist_xml_DATA = $(doc_sources)
 
 include $(top_srcdir)/xmlrules.in
+
+endif ENABLE_DOCS
diff --git a/general/input/Makefile.am b/general/input/Makefile.am
index ede099f..292ed2c 100644
--- a/general/input/Makefile.am
+++ b/general/input/Makefile.am
@@ -1,4 +1,4 @@
-#  Process this file with automake to create Makefile.in
+if ENABLE_DOCS
 
 doc_sources = XKB-Config.xml XKB-Enhancing.xml
 
@@ -6,3 +6,5 @@ xmldir = $(docdir)/input
 dist_xml_DATA = $(doc_sources)
 
 include $(top_srcdir)/xmlrules.in
+
+endif ENABLE_DOCS
diff --git a/general/platforms/Makefile.am b/general/platforms/Makefile.am
index cd936bb..65dbf2a 100644
--- a/general/platforms/Makefile.am
+++ b/general/platforms/Makefile.am
@@ -1,4 +1,4 @@
-#  Process this file with automake to create Makefile.in
+if ENABLE_DOCS
 
 doc_sources = \
 	Darwin.xml \
@@ -8,3 +8,5 @@ xmldir = $(docdir)/platforms
 dist_xml_DATA = $(doc_sources)
 
 include $(top_srcdir)/xmlrules.in
+
+endif ENABLE_DOCS
-- 
1.6.0.4



More information about the xorg-devel mailing list