diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
| commit | 0fd309bfed8f9f61a8ea8bbbe7628d0af471c070 (patch) | |
| tree | 97a335ffb903e9cf159322f3906f9cb71d660d9c /libX11/specs/XIM | |
| parent | dab40e0df33e80dab53b4ca20760c1fb4388649b (diff) | |
| parent | 5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d (diff) | |
| download | vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.gz vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.bz2 vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/specs/XIM')
| -rw-r--r-- | libX11/specs/XIM/Makefile.am | 39 |
1 files changed, 12 insertions, 27 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
|