svn merge ^/branches/released .

5 files changed, 65 insertions, 58 deletions

diff --git a/xorg-server/doc/xml/Makefile.am b/xorg-server/doc/xml/Makefile.am
index 2913eff55..9feb1f03d 100644
--- a/xorg-server/doc/xml/Makefile.am
+++ b/xorg-server/doc/xml/Makefile.am
@@ -22,14 +22,9 @@
 #

 

 SUBDIRS = dtrace

+doc_sources =  Xserver-spec.xml

 

-XML_FILES = Xserver-spec.xml

-

-include xmlrules.in

-

+# Developer's documentation is not installed

 if ENABLE_DEVEL_DOCS

-noinst_DATA = $(BUILT_DOC_FILES)

+include $(top_srcdir)/doc/xml/xmlrules-noinst.in

 endif

-CLEANFILES = $(CLEAN_DOC_FILES)

-

-EXTRA_DIST = $(XML_FILES)

diff --git a/xorg-server/doc/xml/dtrace/Makefile.am b/xorg-server/doc/xml/dtrace/Makefile.am
index dc6127416..8bbe040d8 100644
--- a/xorg-server/doc/xml/dtrace/Makefile.am
+++ b/xorg-server/doc/xml/dtrace/Makefile.am
@@ -21,18 +21,16 @@
 # DEALINGS IN THE SOFTWARE.

 #

 

-XML_FILES = Xserver-DTrace.xml

-

-include ../xmlrules.in

+doc_sources =  Xserver-DTrace.xml

 

 if ENABLE_DOCS

+

+# This user's documentation is installed only if tracing is available

 if XSERVER_DTRACE

-doc_DATA = $(BUILT_DOC_FILES)

+include $(top_srcdir)/doc/xml/xmlrules-inst.in

 else

-noinst_DATA = $(BUILT_DOC_FILES)

-endif

+include $(top_srcdir)/doc/xml/xmlrules-noinst.in

 endif

 

-CLEANFILES = $(CLEAN_DOC_FILES)

+endif

 

-EXTRA_DIST = $(XML_FILES)

diff --git a/xorg-server/doc/xml/xmlrules-inst.in b/xorg-server/doc/xml/xmlrules-inst.in
new file mode 100644
index 000000000..d6965ff05
--- /dev/null
+++ b/xorg-server/doc/xml/xmlrules-inst.in
@@ -0,0 +1,23 @@
+

+# The doc_sources variable contains one or more DocBook/XML source file.

+# The generated documents will be installed in $(docdir),

+# The DocBook/XML files will always be included in the tarball

+

+dist_doc_DATA = $(doc_sources)

+

+if HAVE_XMLTO

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

+

+if HAVE_FOP

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

+endif

+

+if HAVE_XMLTO_TEXT

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

+endif

+

+CLEANFILES = $(doc_DATA)

+include $(top_srcdir)/doc/xml/xmlrules.in

+

+endif HAVE_XMLTO

+

diff --git a/xorg-server/doc/xml/xmlrules-noinst.in b/xorg-server/doc/xml/xmlrules-noinst.in
new file mode 100644
index 000000000..d582c2efd
--- /dev/null
+++ b/xorg-server/doc/xml/xmlrules-noinst.in
@@ -0,0 +1,22 @@
+

+# The doc_sources variable contains one or more DocBook/XML source file.

+# The generated documents will NOT be installed in $(docdir),

+# The DocBook/XML files will always be included in the tarball

+

+dist_noinst_DATA = $(doc_sources)

+

+if HAVE_XMLTO

+noinst_DATA = $(doc_sources:.xml=.html)

+

+if HAVE_FOP

+noinst_DATA += $(doc_sources:.xml=.pdf)

+endif

+

+if HAVE_XMLTO_TEXT

+noinst_DATA += $(doc_sources:.xml=.txt)

+endif

+

+CLEANFILES = $(noinst_DATA)

+include $(top_srcdir)/doc/xml/xmlrules.in

+

+endif HAVE_XMLTO

diff --git a/xorg-server/doc/xml/xmlrules.in b/xorg-server/doc/xml/xmlrules.in
index 1222bb5af..cc77ffc25 100644
--- a/xorg-server/doc/xml/xmlrules.in
+++ b/xorg-server/doc/xml/xmlrules.in
@@ -21,58 +21,27 @@
 # DEALINGS IN THE SOFTWARE.

 #

 

-# This file is included by Makefile.am in subdirectories that have

-# DocBook XML documentation files.

-#

-# No files are automatically distributed or installed by this subset of rules

-# Any files to be distributed or installed would be listed in the including

-# Makefile.am

-

-TXT_FILES  = $(XML_FILES:%.xml=%.txt)

-HTML_FILES = $(XML_FILES:%.xml=%.html)

-PDF_FILES  = $(XML_FILES:%.xml=%.pdf)

-

-BUILT_DOC_FILES =

+# This file provides pattern rules to generate html/pdf/txt from DocBook/XML

+# A stylesheet is used if xorg-sgml-doctools is installed

+# This file is included by xmlrules-inst.in for installable user's documentation

+# It is included by xmlrules-noinst for non installable developer's documentation

+# If the server version or release date changes, autogen && make

 

+XML_ENT_DIR = $(abs_top_builddir)/doc/xml

 SUFFIXES = .xml .txt .html .pdf

 

-XML_ENT_DIR = $(abs_top_builddir)/doc/xml

 XMLTO_FLAGS = --searchpath $(XML_ENT_DIR)

 

 if HAVE_STYLESHEETS

-XMLTO_FLAGS += -m $(XSL_STYLESHEET)

-BUILT_DOC_FILES += xorg.css

-

-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css

-	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@

+XMLTO_FLAGS += -m $(XSL_STYLESHEET) \

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

 endif

 

-if HAVE_XMLTO

-if HAVE_XMLTO_TEXT

-BUILT_DOC_FILES += $(TXT_FILES)

-.xml.txt:

-	@rm -f $@

+%.txt: %.xml $(XML_ENT_DIR)/xserver.ent

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

-endif

 

-BUILT_DOC_FILES += $(HTML_FILES)

-.xml.html:

-	@rm -f $@

+%.html: %.xml $(XML_ENT_DIR)/xserver.ent

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

 

-if HAVE_FOP

-BUILT_DOC_FILES += $(PDF_FILES)

-.xml.pdf:

-	@rm -f $@

+%.pdf: %.xml $(XML_ENT_DIR)/xserver.ent

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

-endif

-

-endif

-

-CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) xorg.css

-

-# All the files we build depend on the entities

-$(BUILT_DOC_FILES): $(XML_ENT_DIR)/xserver.ent

-

-$(XML_ENT_DIR)/xserver.ent:

-	(cd $(XML_ENT_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@F))