From 5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 1 Apr 2011 07:17:02 +0000 Subject: libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 Apr 2011 --- libX11/specs/XIM/Makefile.am | 65 +++++++++-------------- libX11/specs/i18n/framework/Makefile.am | 50 +++++++----------- libX11/specs/i18n/localedb/Makefile.am | 47 ++++++----------- libX11/specs/i18n/trans/Makefile.am | 47 ++++++----------- libX11/specs/libX11/Makefile.am | 94 ++++++++++++++------------------- 5 files changed, 113 insertions(+), 190 deletions(-) (limited to 'libX11/specs') diff --git a/libX11/specs/XIM/Makefile.am b/libX11/specs/XIM/Makefile.am index c3e191716..a1fa72da5 100644 --- a/libX11/specs/XIM/Makefile.am +++ b/libX11/specs/XIM/Makefile.am @@ -1,40 +1,25 @@ -# -# 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 - -specdir = $(docdir)/$(subdir) -doc_sources = xim.xml -dist_spec_DATA = \ - $(doc_sources) \ - dynamicflowsampleseq.svg \ - dynamicflow.svg \ - eventflow.svg \ - sampleprotocolflow1.svg \ - sampleprotocolflow2.svg \ - staticflowsampleseq.svg \ - staticflow.svg - -include $(top_srcdir)/specs/xmlrules.in - -endif ENABLE_SPECS + +if ENABLE_SPECS +if HAVE_XMLTO + +# Main DocBook/XML files (DOCTYPE book) +docbook = xim.xml + +# Included chapters, appendix, images +chapters = \ + dynamicflowsampleseq.svg \ + dynamicflow.svg \ + eventflow.svg \ + sampleprotocolflow1.svg \ + sampleprotocolflow2.svg \ + staticflowsampleseq.svg \ + staticflow.svg + +# 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..6e8b0106a 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 - -specdir = $(docdir)/$(subdir) -doc_sources = framework.xml -dist_spec_DATA = $(doc_sources) framework.svg - -include $(top_srcdir)/specs/xmlrules.in - -endif ENABLE_SPECS + +if ENABLE_SPECS +if HAVE_XMLTO + +# Main DocBook/XML files (DOCTYPE book) +docbook = framework.xml + +# 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..8db6a7bda 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 - -specdir = $(docdir)/$(subdir) -doc_sources = localedb.xml -dist_spec_DATA = $(doc_sources) - -include $(top_srcdir)/specs/xmlrules.in - -endif ENABLE_SPECS + +if ENABLE_SPECS +if HAVE_XMLTO + +# Main DocBook/XML files (DOCTYPE book) +docbook = localedb.xml + +# 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..cdec7509b 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 - -specdir = $(docdir)/$(subdir) -doc_sources = trans.xml -dist_spec_DATA = $(doc_sources) - -include $(top_srcdir)/specs/xmlrules.in - -endif ENABLE_SPECS + +if ENABLE_SPECS +if HAVE_XMLTO + +# Main DocBook/XML files (DOCTYPE book) +docbook = trans.xml + +# 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..0e59ad887 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 - -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 \ - glossary.xml - -include $(top_srcdir)/specs/xmlrules.in - -endif ENABLE_SPECS + +if ENABLE_SPECS +if HAVE_XMLTO + +# 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 + +# 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 -- cgit v1.2.3