Update to libX11 1.4.3 which was released during the 1.4.2 tests.

Mostly churn in the doc build system, which is disabled on Xenocara for now.
author: Matthieu Herrb <matthieu@cvs.openbsd.org> 2011-05-30 20:52:49 +0000
committer: Matthieu Herrb <matthieu@cvs.openbsd.org> 2011-05-30 20:52:49 +0000
commit: 100eb74c10e53a1f8e0b0b67e836e7703914ca1f (patch)
tree: 12b86a9a91f48575e607c406b958d3e396135a9e /lib/libX11/specs
parent: 5a9fa3dae6adae68de15f37d34f31b19ea867343 (diff)
14 files changed, 1058 insertions, 918 deletions
diff --git a/lib/libX11/specs/Makefile.in b/lib/libX11/specs/Makefile.in
index 6c55973b1..4df3add01 100644
--- a/lib/libX11/specs/Makefile.in
+++ b/lib/libX11/specs/Makefile.in
@@ -141,6 +141,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -226,6 +228,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
diff --git a/lib/libX11/specs/XIM/Makefile.am b/lib/libX11/specs/XIM/Makefile.am
index 6c500a4b8..a1fa72da5 100644
--- a/lib/libX11/specs/XIM/Makefile.am
+++ b/lib/libX11/specs/XIM/Makefile.am
@@ -1,32 +1,12 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_SPECS
+if HAVE_XMLTO
 
-specdir = $(docdir)/$(subdir)
-doc_sources = xim.xml
-dist_spec_DATA = 			\
-	$(doc_sources)			\
+# Main DocBook/XML files (DOCTYPE book)
+docbook = xim.xml
+
+# Included chapters, appendix, images
+chapters =				\
 	dynamicflowsampleseq.svg	\
 	dynamicflow.svg			\
 	eventflow.svg			\
@@ -35,6 +15,11 @@ dist_spec_DATA = 			\
 	staticflowsampleseq.svg		\
 	staticflow.svg
 
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/XIM
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
 
+endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/lib/libX11/specs/XIM/Makefile.in b/lib/libX11/specs/XIM/Makefile.in
index 290ff41d6..cd176b2b4 100644
--- a/lib/libX11/specs/XIM/Makefile.in
+++ b/lib/libX11/specs/XIM/Makefile.in
@@ -15,49 +15,19 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Generate output formats for a single DocBook/XML with/without chapters
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
 #
 
 srcdir = @srcdir@
@@ -82,17 +52,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/specs/xmlrules.in
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(XSL_STYLESHEET)	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam img.src.path=$(abs_builddir)/	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) html
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_5 = .xml .ps .pdf .txt .html
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
 subdir = specs/XIM
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
@@ -105,7 +68,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__dist_spec_DATA_DIST = xim.xml dynamicflowsampleseq.svg \
+am__dist_shelf_DATA_DIST = xim.xml dynamicflowsampleseq.svg \
 	dynamicflow.svg eventflow.svg sampleprotocolflow1.svg \
 	sampleprotocolflow2.svg staticflowsampleseq.svg staticflow.svg
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -114,10 +77,12 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"
-dist_specDATA_INSTALL = $(INSTALL_DATA)
-specDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_spec_DATA) $(spec_DATA)
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \
+	"$(DESTDIR)$(shelfdir)"
+dist_shelfDATA_INSTALL = $(INSTALL_DATA)
+sgmldbsDATA_INSTALL = $(INSTALL_DATA)
+shelfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -179,6 +144,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -264,6 +231,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
@@ -315,30 +283,78 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir)
-@ENABLE_SPECS_TRUE@doc_sources = xim.xml
-@ENABLE_SPECS_TRUE@dist_spec_DATA = \
-@ENABLE_SPECS_TRUE@	$(doc_sources)			\
-@ENABLE_SPECS_TRUE@	dynamicflowsampleseq.svg	\
-@ENABLE_SPECS_TRUE@	dynamicflow.svg			\
-@ENABLE_SPECS_TRUE@	eventflow.svg			\
-@ENABLE_SPECS_TRUE@	sampleprotocolflow1.svg		\
-@ENABLE_SPECS_TRUE@	sampleprotocolflow2.svg		\
-@ENABLE_SPECS_TRUE@	staticflowsampleseq.svg		\
-@ENABLE_SPECS_TRUE@	staticflow.svg
-
-@ENABLE_SPECS_TRUE@CLEANFILES = $(am__append_4)
-@ENABLE_SPECS_TRUE@SUFFIXES = $(am__append_5)
-@ENABLE_SPECS_TRUE@XMLTO_FLAGS = $(am__append_3)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA =  \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(doc_sources:.xml=.html) \
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = xim.xml
+
+# Included chapters, appendix, images
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	dynamicflowsampleseq.svg	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	dynamicflow.svg			\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	eventflow.svg			\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	sampleprotocolflow1.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	sampleprotocolflow2.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	staticflowsampleseq.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	staticflow.svg
+
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/XIM
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA =  \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.html) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+
+# The location where all cross reference databases are installed
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(masterdb)	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam collect.xref.targets="no"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+
+# DocBook/XML generated document cross-reference database
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only"	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .xml .ps .pdf .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/specs/xmlrules.in $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -377,39 +393,56 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-dist_specDATA: $(dist_spec_DATA)
+install-dist_shelfDATA: $(dist_shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-dist_specDATA:
+uninstall-dist_shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
-install-specDATA: $(spec_DATA)
+install-sgmldbsDATA: $(sgmldbs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(spec_DATA)'; for p in $$list; do \
+	test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)"
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
 
-uninstall-specDATA:
+uninstall-sgmldbsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(spec_DATA)'; for p in $$list; do \
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \
+	done
+install-shelfDATA: $(shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+
+uninstall-shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -419,7 +452,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../specs
+	$(mkdir_p) $(distdir)/../..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -450,7 +483,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -496,7 +529,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_specDATA install-specDATA
+install-data-am: install-dist_shelfDATA install-sgmldbsDATA \
+	install-shelfDATA
 
 install-exec-am:
 
@@ -522,35 +556,39 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_specDATA uninstall-info-am \
-	uninstall-specDATA
+uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
+	uninstall-sgmldbsDATA uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_specDATA \
+	install-data install-data-am install-dist_shelfDATA \
 	install-exec install-exec-am install-info install-info-am \
-	install-man install-specDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_specDATA uninstall-info-am uninstall-specDATA
-
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+	install-man install-sgmldbsDATA install-shelfDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-dist_shelfDATA \
+	uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.fo.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+# Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libX11/specs/XKB/Makefile.am b/lib/libX11/specs/XKB/Makefile.am
index e6a09cf52..3939db6aa 100644
--- a/lib/libX11/specs/XKB/Makefile.am
+++ b/lib/libX11/specs/XKB/Makefile.am
@@ -1,32 +1,12 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_SPECS
+if HAVE_XMLTO
 
-specdir = $(docdir)/$(subdir)
-doc_sources = xkblib.xml
-dist_spec_DATA = 		\
-	$(doc_sources)		\
+# Main DocBook/XML files (DOCTYPE book)
+docbook = xkblib.xml
+
+# Included chapters, appendix, images
+chapters =			\
 	acknowledgement.xml	\
 	ch01.xml		\
 	ch02.xml		\
@@ -73,6 +53,11 @@ dist_spec_DATA = 		\
 	XKBlib-20.svg		\
 	XKBlib-21.svg
 
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/XKB
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
 
+endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/lib/libX11/specs/XKB/Makefile.in b/lib/libX11/specs/XKB/Makefile.in
index 7b93f0bca..104b98a3a 100644
--- a/lib/libX11/specs/XKB/Makefile.in
+++ b/lib/libX11/specs/XKB/Makefile.in
@@ -15,49 +15,19 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Generate output formats for a single DocBook/XML with/without chapters
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
 #
 
 srcdir = @srcdir@
@@ -82,17 +52,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/specs/xmlrules.in
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(XSL_STYLESHEET)	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam img.src.path=$(abs_builddir)/	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) html
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_5 = .xml .ps .pdf .txt .html
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
 subdir = specs/XKB
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
@@ -105,7 +68,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__dist_spec_DATA_DIST = xkblib.xml acknowledgement.xml ch01.xml \
+am__dist_shelf_DATA_DIST = xkblib.xml acknowledgement.xml ch01.xml \
 	ch02.xml ch03.xml ch04.xml ch05.xml ch06.xml ch07.xml ch08.xml \
 	ch09.xml ch10.xml ch11.xml ch12.xml ch13.xml ch14.xml ch15.xml \
 	ch16.xml ch17.xml ch18.xml ch19.xml ch20.xml ch21.xml ch22.xml \
@@ -121,10 +84,12 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"
-dist_specDATA_INSTALL = $(INSTALL_DATA)
-specDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_spec_DATA) $(spec_DATA)
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \
+	"$(DESTDIR)$(shelfdir)"
+dist_shelfDATA_INSTALL = $(INSTALL_DATA)
+sgmldbsDATA_INSTALL = $(INSTALL_DATA)
+shelfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -186,6 +151,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -271,6 +238,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
@@ -322,68 +290,116 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir)
-@ENABLE_SPECS_TRUE@doc_sources = xkblib.xml
-@ENABLE_SPECS_TRUE@dist_spec_DATA = \
-@ENABLE_SPECS_TRUE@	$(doc_sources)		\
-@ENABLE_SPECS_TRUE@	acknowledgement.xml	\
-@ENABLE_SPECS_TRUE@	ch01.xml		\
-@ENABLE_SPECS_TRUE@	ch02.xml		\
-@ENABLE_SPECS_TRUE@	ch03.xml		\
-@ENABLE_SPECS_TRUE@	ch04.xml		\
-@ENABLE_SPECS_TRUE@	ch05.xml		\
-@ENABLE_SPECS_TRUE@	ch06.xml		\
-@ENABLE_SPECS_TRUE@	ch07.xml		\
-@ENABLE_SPECS_TRUE@	ch08.xml		\
-@ENABLE_SPECS_TRUE@	ch09.xml		\
-@ENABLE_SPECS_TRUE@	ch10.xml		\
-@ENABLE_SPECS_TRUE@	ch11.xml		\
-@ENABLE_SPECS_TRUE@	ch12.xml		\
-@ENABLE_SPECS_TRUE@	ch13.xml		\
-@ENABLE_SPECS_TRUE@	ch14.xml		\
-@ENABLE_SPECS_TRUE@	ch15.xml		\
-@ENABLE_SPECS_TRUE@	ch16.xml		\
-@ENABLE_SPECS_TRUE@	ch17.xml		\
-@ENABLE_SPECS_TRUE@	ch18.xml		\
-@ENABLE_SPECS_TRUE@	ch19.xml		\
-@ENABLE_SPECS_TRUE@	ch20.xml		\
-@ENABLE_SPECS_TRUE@	ch21.xml		\
-@ENABLE_SPECS_TRUE@	ch22.xml		\
-@ENABLE_SPECS_TRUE@	glossary.xml		\
-@ENABLE_SPECS_TRUE@	XKBlib-1.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-2.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-3.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-4.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-5.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-6.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-7.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-8.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-9.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-10.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-11.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-12.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-13.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-14.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-15.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-16.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-17.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-18.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-19.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-20.svg		\
-@ENABLE_SPECS_TRUE@	XKBlib-21.svg
-
-@ENABLE_SPECS_TRUE@CLEANFILES = $(am__append_4)
-@ENABLE_SPECS_TRUE@SUFFIXES = $(am__append_5)
-@ENABLE_SPECS_TRUE@XMLTO_FLAGS = $(am__append_3)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA =  \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(doc_sources:.xml=.html) \
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = xkblib.xml
+
+# Included chapters, appendix, images
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	acknowledgement.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch01.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch02.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch03.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch04.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch05.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch06.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch07.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch08.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch09.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch10.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch11.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch12.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch13.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch14.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch15.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch16.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch17.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch18.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch19.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch20.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch21.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	ch22.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	glossary.xml		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-1.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-2.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-3.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-4.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-5.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-6.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-7.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-8.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-9.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-10.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-11.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-12.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-13.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-14.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-15.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-16.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-17.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-18.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-19.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-20.svg		\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	XKBlib-21.svg
+
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/XKB
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA =  \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.html) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+
+# The location where all cross reference databases are installed
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(masterdb)	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam collect.xref.targets="no"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+
+# DocBook/XML generated document cross-reference database
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only"	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .xml .ps .pdf .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/specs/xmlrules.in $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -422,39 +438,56 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-dist_specDATA: $(dist_spec_DATA)
+install-dist_shelfDATA: $(dist_shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-dist_specDATA:
+uninstall-dist_shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
-install-specDATA: $(spec_DATA)
+install-sgmldbsDATA: $(sgmldbs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(spec_DATA)'; for p in $$list; do \
+	test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)"
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
 
-uninstall-specDATA:
+uninstall-sgmldbsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(spec_DATA)'; for p in $$list; do \
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \
+	done
+install-shelfDATA: $(shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+
+uninstall-shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -464,7 +497,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../specs
+	$(mkdir_p) $(distdir)/../..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -495,7 +528,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -541,7 +574,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_specDATA install-specDATA
+install-data-am: install-dist_shelfDATA install-sgmldbsDATA \
+	install-shelfDATA
 
 install-exec-am:
 
@@ -567,35 +601,39 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_specDATA uninstall-info-am \
-	uninstall-specDATA
+uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
+	uninstall-sgmldbsDATA uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_specDATA \
+	install-data install-data-am install-dist_shelfDATA \
 	install-exec install-exec-am install-info install-info-am \
-	install-man install-specDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_specDATA uninstall-info-am uninstall-specDATA
-
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+	install-man install-sgmldbsDATA install-shelfDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-dist_shelfDATA \
+	uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.fo.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+# Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libX11/specs/i18n/Makefile.in b/lib/libX11/specs/i18n/Makefile.in
index d89cf9da4..4f52edd0f 100644
--- a/lib/libX11/specs/i18n/Makefile.in
+++ b/lib/libX11/specs/i18n/Makefile.in
@@ -141,6 +141,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -226,6 +228,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
diff --git a/lib/libX11/specs/i18n/framework/Makefile.am b/lib/libX11/specs/i18n/framework/Makefile.am
index d2c86dfd3..6e8b0106a 100644
--- a/lib/libX11/specs/i18n/framework/Makefile.am
+++ b/lib/libX11/specs/i18n/framework/Makefile.am
@@ -1,32 +1,18 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_SPECS
+if HAVE_XMLTO
 
-specdir = $(docdir)/$(subdir)
-doc_sources = framework.xml
-dist_spec_DATA = $(doc_sources) framework.svg
+# Main DocBook/XML files (DOCTYPE book)
+docbook = framework.xml
 
-include $(top_srcdir)/specs/xmlrules.in
+# Included chapters, appendix, images
+chapters = framework.svg
 
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/framework
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/lib/libX11/specs/i18n/framework/Makefile.in b/lib/libX11/specs/i18n/framework/Makefile.in
index 955e7e14f..da978ce99 100644
--- a/lib/libX11/specs/i18n/framework/Makefile.in
+++ b/lib/libX11/specs/i18n/framework/Makefile.in
@@ -15,49 +15,19 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Generate output formats for a single DocBook/XML with/without chapters
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
 #
 
 srcdir = @srcdir@
@@ -82,17 +52,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/specs/xmlrules.in
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(XSL_STYLESHEET)	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam img.src.path=$(abs_builddir)/	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) html
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_5 = .xml .ps .pdf .txt .html
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
 subdir = specs/i18n/framework
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
@@ -105,17 +68,19 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__dist_spec_DATA_DIST = framework.xml framework.svg
+am__dist_shelf_DATA_DIST = framework.xml framework.svg
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"
-dist_specDATA_INSTALL = $(INSTALL_DATA)
-specDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_spec_DATA) $(spec_DATA)
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \
+	"$(DESTDIR)$(shelfdir)"
+dist_shelfDATA_INSTALL = $(INSTALL_DATA)
+sgmldbsDATA_INSTALL = $(INSTALL_DATA)
+shelfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -177,6 +142,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -262,6 +229,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
@@ -313,21 +281,70 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir)
-@ENABLE_SPECS_TRUE@doc_sources = framework.xml
-@ENABLE_SPECS_TRUE@dist_spec_DATA = $(doc_sources) framework.svg
-@ENABLE_SPECS_TRUE@CLEANFILES = $(am__append_4)
-@ENABLE_SPECS_TRUE@SUFFIXES = $(am__append_5)
-@ENABLE_SPECS_TRUE@XMLTO_FLAGS = $(am__append_3)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA =  \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(doc_sources:.xml=.html) \
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = framework.xml
+
+# Included chapters, appendix, images
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = framework.svg
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/framework
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA =  \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.html) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+
+# The location where all cross reference databases are installed
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(masterdb)	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam collect.xref.targets="no"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+
+# DocBook/XML generated document cross-reference database
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only"	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .xml .ps .pdf .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/specs/xmlrules.in $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -366,39 +383,56 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-dist_specDATA: $(dist_spec_DATA)
+install-dist_shelfDATA: $(dist_shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-dist_specDATA:
+uninstall-dist_shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
-install-specDATA: $(spec_DATA)
+install-sgmldbsDATA: $(sgmldbs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(spec_DATA)'; for p in $$list; do \
+	test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)"
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
 
-uninstall-specDATA:
+uninstall-sgmldbsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(spec_DATA)'; for p in $$list; do \
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \
+	done
+install-shelfDATA: $(shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+
+uninstall-shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -408,7 +442,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../specs
+	$(mkdir_p) $(distdir)/../../..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -439,7 +473,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -485,7 +519,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_specDATA install-specDATA
+install-data-am: install-dist_shelfDATA install-sgmldbsDATA \
+	install-shelfDATA
 
 install-exec-am:
 
@@ -511,35 +546,39 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_specDATA uninstall-info-am \
-	uninstall-specDATA
+uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
+	uninstall-sgmldbsDATA uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_specDATA \
+	install-data install-data-am install-dist_shelfDATA \
 	install-exec install-exec-am install-info install-info-am \
-	install-man install-specDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_specDATA uninstall-info-am uninstall-specDATA
-
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+	install-man install-sgmldbsDATA install-shelfDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-dist_shelfDATA \
+	uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.fo.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+# Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libX11/specs/i18n/localedb/Makefile.am b/lib/libX11/specs/i18n/localedb/Makefile.am
index 2046e7361..8db6a7bda 100644
--- a/lib/libX11/specs/i18n/localedb/Makefile.am
+++ b/lib/libX11/specs/i18n/localedb/Makefile.am
@@ -1,32 +1,15 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_SPECS
+if HAVE_XMLTO
 
-specdir = $(docdir)/$(subdir)
-doc_sources = localedb.xml
-dist_spec_DATA = $(doc_sources)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = localedb.xml
 
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/localedb
 
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/lib/libX11/specs/i18n/localedb/Makefile.in b/lib/libX11/specs/i18n/localedb/Makefile.in
index dcd8e42ac..05f34c04f 100644
--- a/lib/libX11/specs/i18n/localedb/Makefile.in
+++ b/lib/libX11/specs/i18n/localedb/Makefile.in
@@ -15,49 +15,19 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Generate output formats for a single DocBook/XML with/without chapters
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
 #
 
 srcdir = @srcdir@
@@ -82,17 +52,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/specs/xmlrules.in
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(XSL_STYLESHEET)	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam img.src.path=$(abs_builddir)/	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) html
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_5 = .xml .ps .pdf .txt .html
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
 subdir = specs/i18n/localedb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
@@ -105,17 +68,19 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__dist_spec_DATA_DIST = localedb.xml
+am__dist_shelf_DATA_DIST = localedb.xml
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"
-dist_specDATA_INSTALL = $(INSTALL_DATA)
-specDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_spec_DATA) $(spec_DATA)
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \
+	"$(DESTDIR)$(shelfdir)"
+dist_shelfDATA_INSTALL = $(INSTALL_DATA)
+sgmldbsDATA_INSTALL = $(INSTALL_DATA)
+shelfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -177,6 +142,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -262,6 +229,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
@@ -313,21 +281,67 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir)
-@ENABLE_SPECS_TRUE@doc_sources = localedb.xml
-@ENABLE_SPECS_TRUE@dist_spec_DATA = $(doc_sources)
-@ENABLE_SPECS_TRUE@CLEANFILES = $(am__append_4)
-@ENABLE_SPECS_TRUE@SUFFIXES = $(am__append_5)
-@ENABLE_SPECS_TRUE@XMLTO_FLAGS = $(am__append_3)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA =  \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(doc_sources:.xml=.html) \
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = localedb.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/localedb
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA =  \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.html) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+
+# The location where all cross reference databases are installed
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(masterdb)	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam collect.xref.targets="no"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+
+# DocBook/XML generated document cross-reference database
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only"	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .xml .ps .pdf .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/specs/xmlrules.in $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -366,39 +380,56 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-dist_specDATA: $(dist_spec_DATA)
+install-dist_shelfDATA: $(dist_shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+
+uninstall-dist_shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+install-sgmldbsDATA: $(sgmldbs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)"
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
 
-uninstall-dist_specDATA:
+uninstall-sgmldbsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
-install-specDATA: $(spec_DATA)
+install-shelfDATA: $(shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(spec_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-specDATA:
+uninstall-shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(spec_DATA)'; for p in $$list; do \
+	@list='$(shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -408,7 +439,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../specs
+	$(mkdir_p) $(distdir)/../../..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -439,7 +470,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -485,7 +516,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_specDATA install-specDATA
+install-data-am: install-dist_shelfDATA install-sgmldbsDATA \
+	install-shelfDATA
 
 install-exec-am:
 
@@ -511,35 +543,39 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_specDATA uninstall-info-am \
-	uninstall-specDATA
+uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
+	uninstall-sgmldbsDATA uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_specDATA \
+	install-data install-data-am install-dist_shelfDATA \
 	install-exec install-exec-am install-info install-info-am \
-	install-man install-specDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_specDATA uninstall-info-am uninstall-specDATA
-
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+	install-man install-sgmldbsDATA install-shelfDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-dist_shelfDATA \
+	uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.fo.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+# Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libX11/specs/i18n/trans/Makefile.am b/lib/libX11/specs/i18n/trans/Makefile.am
index 456e59e3d..cdec7509b 100644
--- a/lib/libX11/specs/i18n/trans/Makefile.am
+++ b/lib/libX11/specs/i18n/trans/Makefile.am
@@ -1,32 +1,15 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_SPECS
+if HAVE_XMLTO
 
-specdir = $(docdir)/$(subdir)
-doc_sources = trans.xml
-dist_spec_DATA = $(doc_sources)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = trans.xml
 
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/trans
 
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/lib/libX11/specs/i18n/trans/Makefile.in b/lib/libX11/specs/i18n/trans/Makefile.in
index 449f5486c..ed8e190aa 100644
--- a/lib/libX11/specs/i18n/trans/Makefile.in
+++ b/lib/libX11/specs/i18n/trans/Makefile.in
@@ -15,49 +15,19 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Generate output formats for a single DocBook/XML with/without chapters
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
 #
 
 srcdir = @srcdir@
@@ -82,17 +52,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/specs/xmlrules.in
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(XSL_STYLESHEET)	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam img.src.path=$(abs_builddir)/	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) html
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_5 = .xml .ps .pdf .txt .html
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
 subdir = specs/i18n/trans
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
@@ -105,17 +68,19 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__dist_spec_DATA_DIST = trans.xml
+am__dist_shelf_DATA_DIST = trans.xml
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"
-dist_specDATA_INSTALL = $(INSTALL_DATA)
-specDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_spec_DATA) $(spec_DATA)
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \
+	"$(DESTDIR)$(shelfdir)"
+dist_shelfDATA_INSTALL = $(INSTALL_DATA)
+sgmldbsDATA_INSTALL = $(INSTALL_DATA)
+shelfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -177,6 +142,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -262,6 +229,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
@@ -313,21 +281,67 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir)
-@ENABLE_SPECS_TRUE@doc_sources = trans.xml
-@ENABLE_SPECS_TRUE@dist_spec_DATA = $(doc_sources)
-@ENABLE_SPECS_TRUE@CLEANFILES = $(am__append_4)
-@ENABLE_SPECS_TRUE@SUFFIXES = $(am__append_5)
-@ENABLE_SPECS_TRUE@XMLTO_FLAGS = $(am__append_3)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA =  \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(doc_sources:.xml=.html) \
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = trans.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/trans
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA =  \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.html) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+
+# The location where all cross reference databases are installed
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(masterdb)	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam collect.xref.targets="no"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+
+# DocBook/XML generated document cross-reference database
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only"	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .xml .ps .pdf .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/specs/xmlrules.in $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -366,39 +380,56 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-dist_specDATA: $(dist_spec_DATA)
+install-dist_shelfDATA: $(dist_shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+
+uninstall-dist_shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+install-sgmldbsDATA: $(sgmldbs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)"
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
 
-uninstall-dist_specDATA:
+uninstall-sgmldbsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
-install-specDATA: $(spec_DATA)
+install-shelfDATA: $(shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(spec_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-specDATA:
+uninstall-shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(spec_DATA)'; for p in $$list; do \
+	@list='$(shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -408,7 +439,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../specs
+	$(mkdir_p) $(distdir)/../../..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -439,7 +470,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -485,7 +516,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_specDATA install-specDATA
+install-data-am: install-dist_shelfDATA install-sgmldbsDATA \
+	install-shelfDATA
 
 install-exec-am:
 
@@ -511,35 +543,39 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_specDATA uninstall-info-am \
-	uninstall-specDATA
+uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
+	uninstall-sgmldbsDATA uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_specDATA \
+	install-data install-data-am install-dist_shelfDATA \
 	install-exec install-exec-am install-info install-info-am \
-	install-man install-specDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_specDATA uninstall-info-am uninstall-specDATA
-
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+	install-man install-sgmldbsDATA install-shelfDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-dist_shelfDATA \
+	uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.fo.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+# Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libX11/specs/libX11/Makefile.am b/lib/libX11/specs/libX11/Makefile.am
index 756b85f9f..0e59ad887 100644
--- a/lib/libX11/specs/libX11/Makefile.am
+++ b/lib/libX11/specs/libX11/Makefile.am
@@ -1,54 +1,40 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
 
 if ENABLE_SPECS
+if HAVE_XMLTO
 
-specdir = $(docdir)/$(subdir)
-doc_sources = libX11.xml
-dist_spec_DATA = $(doc_sources)	\
-	AppA.xml		\
-	AppB.xml		\
-	AppC.xml		\
-	AppD.xml		\
-	CH01.xml		\
-	CH02.xml		\
-	CH03.xml		\
-	CH04.xml		\
-	CH05.xml		\
-	CH06.xml		\
-	CH07.xml		\
-	CH08.xml		\
-	CH09.xml		\
-	CH10.xml		\
-	CH11.xml		\
-	CH12.xml		\
-	CH13.xml		\
-	CH14.xml		\
-	CH15.xml		\
-	CH16.xml		\
-	credits.xml		\
+# Main DocBook/XML files (DOCTYPE book)
+docbook = libX11.xml
+
+# Included chapters, appendix, images
+chapters =		\
+	AppA.xml	\
+	AppB.xml	\
+	AppC.xml	\
+	AppD.xml	\
+	CH01.xml	\
+	CH02.xml	\
+	CH03.xml	\
+	CH04.xml	\
+	CH05.xml	\
+	CH06.xml	\
+	CH07.xml	\
+	CH08.xml	\
+	CH09.xml	\
+	CH10.xml	\
+	CH11.xml	\
+	CH12.xml	\
+	CH13.xml	\
+	CH14.xml	\
+	CH15.xml	\
+	CH16.xml	\
+	credits.xml	\
 	glossary.xml
 
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
 
+endif HAVE_XMLTO
 endif ENABLE_SPECS
diff --git a/lib/libX11/specs/libX11/Makefile.in b/lib/libX11/specs/libX11/Makefile.in
index c5eed47bd..a0c73bad9 100644
--- a/lib/libX11/specs/libX11/Makefile.in
+++ b/lib/libX11/specs/libX11/Makefile.in
@@ -15,49 +15,19 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Generate output formats for a single DocBook/XML with/without chapters
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
 #
 
 srcdir = @srcdir@
@@ -82,17 +52,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(am__dist_spec_DATA_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/specs/xmlrules.in
-@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt)
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = \
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(XSL_STYLESHEET)	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam img.src.path=$(abs_builddir)/	\
-@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) html
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_5 = .xml .ps .pdf .txt .html
+DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
 subdir = specs/libX11
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
@@ -105,7 +68,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__dist_spec_DATA_DIST = libX11.xml AppA.xml AppB.xml AppC.xml \
+am__dist_shelf_DATA_DIST = libX11.xml AppA.xml AppB.xml AppC.xml \
 	AppD.xml CH01.xml CH02.xml CH03.xml CH04.xml CH05.xml CH06.xml \
 	CH07.xml CH08.xml CH09.xml CH10.xml CH11.xml CH12.xml CH13.xml \
 	CH14.xml CH15.xml CH16.xml credits.xml glossary.xml
@@ -115,10 +78,12 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"
-dist_specDATA_INSTALL = $(INSTALL_DATA)
-specDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_spec_DATA) $(spec_DATA)
+am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \
+	"$(DESTDIR)$(shelfdir)"
+dist_shelfDATA_INSTALL = $(INSTALL_DATA)
+sgmldbsDATA_INSTALL = $(INSTALL_DATA)
+shelfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -180,6 +145,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
 HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
 HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
+HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
+HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -265,6 +232,7 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XORG_SGML_PATH = @XORG_SGML_PATH@
+XSLTPROC = @XSLTPROC@
 XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
@@ -316,44 +284,93 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-@ENABLE_SPECS_TRUE@specdir = $(docdir)/$(subdir)
-@ENABLE_SPECS_TRUE@doc_sources = libX11.xml
-@ENABLE_SPECS_TRUE@dist_spec_DATA = $(doc_sources)	\
-@ENABLE_SPECS_TRUE@	AppA.xml		\
-@ENABLE_SPECS_TRUE@	AppB.xml		\
-@ENABLE_SPECS_TRUE@	AppC.xml		\
-@ENABLE_SPECS_TRUE@	AppD.xml		\
-@ENABLE_SPECS_TRUE@	CH01.xml		\
-@ENABLE_SPECS_TRUE@	CH02.xml		\
-@ENABLE_SPECS_TRUE@	CH03.xml		\
-@ENABLE_SPECS_TRUE@	CH04.xml		\
-@ENABLE_SPECS_TRUE@	CH05.xml		\
-@ENABLE_SPECS_TRUE@	CH06.xml		\
-@ENABLE_SPECS_TRUE@	CH07.xml		\
-@ENABLE_SPECS_TRUE@	CH08.xml		\
-@ENABLE_SPECS_TRUE@	CH09.xml		\
-@ENABLE_SPECS_TRUE@	CH10.xml		\
-@ENABLE_SPECS_TRUE@	CH11.xml		\
-@ENABLE_SPECS_TRUE@	CH12.xml		\
-@ENABLE_SPECS_TRUE@	CH13.xml		\
-@ENABLE_SPECS_TRUE@	CH14.xml		\
-@ENABLE_SPECS_TRUE@	CH15.xml		\
-@ENABLE_SPECS_TRUE@	CH16.xml		\
-@ENABLE_SPECS_TRUE@	credits.xml		\
-@ENABLE_SPECS_TRUE@	glossary.xml
-
-@ENABLE_SPECS_TRUE@CLEANFILES = $(am__append_4)
-@ENABLE_SPECS_TRUE@SUFFIXES = $(am__append_5)
-@ENABLE_SPECS_TRUE@XMLTO_FLAGS = $(am__append_3)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@spec_DATA =  \
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(doc_sources:.xml=.html) \
+
+# Main DocBook/XML files (DOCTYPE book)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = libX11.xml
+
+# Included chapters, appendix, images
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	AppA.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	AppB.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	AppC.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	AppD.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH01.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH02.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH03.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH04.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH05.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH06.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH07.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH08.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH09.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH10.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH11.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH12.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH13.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH14.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH15.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	CH16.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	credits.xml	\
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	glossary.xml
+
+
+# The location where the DocBook/XML files and their generated formats are installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)
+
+# DocBook/XML generated output formats to be installed
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA =  \
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(docbook:.xml=.html) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
 @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+
+# DocBook/XML file with chapters, appendix and images it includes
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+
+# The location where all cross reference databases are installed
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam target.database.document=$(masterdb)	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam collect.xref.targets="no"
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+
+# DocBook/XML generated document cross-reference database
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--path "$(XORG_SGML_PATH)/X11"			\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam targets.filename "$@"		\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--stringparam collect.xref.targets "only"	\
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	--nonet --xinclude
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .xml .ps .pdf .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/specs/xmlrules.in $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -392,39 +409,56 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-dist_specDATA: $(dist_spec_DATA)
+install-dist_shelfDATA: $(dist_shelf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dist_specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(dist_specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 
-uninstall-dist_specDATA:
+uninstall-dist_shelfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_spec_DATA)'; for p in $$list; do \
+	@list='$(dist_shelf_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
-install-specDATA: $(spec_DATA)
+install-sgmldbsDATA: $(sgmldbs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(specdir)" || $(mkdir_p) "$(DESTDIR)$(specdir)"
-	@list='$(spec_DATA)'; for p in $$list; do \
+	test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)"
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(specDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(specdir)/$$f'"; \
-	  $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \
 	done
 
-uninstall-specDATA:
+uninstall-sgmldbsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(spec_DATA)'; for p in $$list; do \
+	@list='$(sgmldbs_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(specdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(specdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \
+	done
+install-shelfDATA: $(shelf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
+	done
+
+uninstall-shelfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(shelf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -434,7 +468,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../specs
+	$(mkdir_p) $(distdir)/../..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -465,7 +499,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(specdir)" "$(DESTDIR)$(specdir)"; do \
+	for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -511,7 +545,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_specDATA install-specDATA
+install-data-am: install-dist_shelfDATA install-sgmldbsDATA \
+	install-shelfDATA
 
 install-exec-am:
 
@@ -537,35 +572,39 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_specDATA uninstall-info-am \
-	uninstall-specDATA
+uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
+	uninstall-sgmldbsDATA uninstall-shelfDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_specDATA \
+	install-data install-data-am install-dist_shelfDATA \
 	install-exec install-exec-am install-info install-info-am \
-	install-man install-specDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_specDATA uninstall-info-am uninstall-specDATA
-
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_spec_DATA)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources)
-@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+	install-man install-sgmldbsDATA install-shelfDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-dist_shelfDATA \
+	uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA
+
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml  $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.fo.db: %.xml $(chapters)
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@	http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+# Generate DocBook/XML output formats with or without stylesheets
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
author	Matthieu Herrb <matthieu@cvs.openbsd.org>	2011-05-30 20:52:49 +0000
committer	Matthieu Herrb <matthieu@cvs.openbsd.org>	2011-05-30 20:52:49 +0000
commit	100eb74c10e53a1f8e0b0b67e836e7703914ca1f (patch)
tree	12b86a9a91f48575e607c406b958d3e396135a9e /lib/libX11/specs
parent	5a9fa3dae6adae68de15f37d34f31b19ea867343 (diff)