From 5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
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 +++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 40 deletions(-)

(limited to 'libX11/specs/XIM')

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
-- 
cgit v1.2.3