svn merge ^/branches/released .

5 files changed, 75 insertions, 152 deletions

diff --git a/libX11/specs/XIM/Makefile.am b/libX11/specs/XIM/Makefile.am
index c3e191716..838ec1e8d 100644
--- a/libX11/specs/XIM/Makefile.am
+++ b/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/libX11/specs/i18n/framework/Makefile.am b/libX11/specs/i18n/framework/Makefile.am
index 8f6364a03..eb2f0db97 100644
--- a/libX11/specs/i18n/framework/Makefile.am
+++ b/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/libX11/specs/i18n/localedb/Makefile.am b/libX11/specs/i18n/localedb/Makefile.am
index 99b5086da..71014222d 100644
--- a/libX11/specs/i18n/localedb/Makefile.am
+++ b/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/libX11/specs/i18n/trans/Makefile.am b/libX11/specs/i18n/trans/Makefile.am
index dfdf34f05..e962980b8 100644
--- a/libX11/specs/i18n/trans/Makefile.am
+++ b/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/libX11/specs/libX11/Makefile.am b/libX11/specs/libX11/Makefile.am
index bd51baf1f..3d7049a38 100644
--- a/libX11/specs/libX11/Makefile.am
+++ b/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