svn merge ^/branches/released .

1 files changed, 6 insertions, 52 deletions

diff --git a/libXext/specs/Makefile.am b/libXext/specs/Makefile.am
index 10dbed24f..d4f57b6c5 100644
--- a/libXext/specs/Makefile.am
+++ b/libXext/specs/Makefile.am
@@ -1,61 +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

-doc_sources = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml

-dist_doc_DATA = $(doc_sources)

-

 if HAVE_XMLTO

-doc_DATA = $(doc_sources:.xml=.html)

-

-if HAVE_FOP

-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)

-endif

-

-if HAVE_XMLTO_TEXT

-doc_DATA += $(doc_sources:.xml=.txt)

-endif

-

-if HAVE_STYLESHEETS

-XMLTO_FLAGS = -m $(XSL_STYLESHEET) \

-	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css

-endif

-

-CLEANFILES = $(doc_DATA)

-

-SUFFIXES = .xml .ps .pdf .txt .html

-

-.xml.txt:

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<

 

-.xml.html:

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<

+# Main DocBook/XML files (DOCTYPE book)

+docbook = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml

 

-.xml.pdf:

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<

+# The location where the DocBook/XML files and their generated formats are installed

+shelfdir = $(docdir)

 

-.xml.ps:

-	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<

+# Generate DocBook/XML output formats with or without stylesheets

+include $(top_srcdir)/docbook.am

 

 endif HAVE_XMLTO

 endif ENABLE_SPECS