diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-11-07 10:32:21 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-11-08 11:13:50 -0500 |
| commit | 8b52358bde047c9ecbd4a52c13591ce0df28be9e (patch) | |
| tree | 71afdde862ccf793aff29db470ff765084d6bb41 | |
| parent | fdebf058052aca57361153687fcdb5cd29b68cae (diff) | |
Implement the --disable-docs option
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
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | general/Makefile.am | 5 | ||||
| -rw-r--r-- | general/fonts/Makefile.am | 4 | ||||
| -rw-r--r-- | general/graphics/Makefile.am | 4 | ||||
| -rw-r--r-- | general/input/Makefile.am | 4 | ||||
| -rw-r--r-- | 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 |