Restore generation of specs from docbook in autotools builds

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Makefile.am

@@ -422,7 +422,7 @@ xinerama_HEADERS = \
 xineramaprotopkgconfigdir = $(datadir)/pkgconfig
 xineramaprotopkgconfig_DATA = xineramaproto.pc
 
-# SUBDIRS=specs
+SUBDIRS=specs
 
 dist_doc_DATA = \
 	compositeproto.txt \
@@ -487,12 +487,6 @@ EXTRA_DIST = \
     meson.build \
     meson_options.txt \
     man/Xprint.man \
-    man/Xprint.sgml \
-    specs/xp_proto.book \
-    specs/xp_proto.mif \
-    specs/xp_proto.ps \
-    specs/xp_protoIX.doc \
-    specs/xp_protoTOC.doc \
-    specs/xp_proto_cov.mif
+    man/Xprint.sgml
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-legacy

configure.ac

@@ -129,6 +129,15 @@ AC_CONFIG_FILES([applewmproto.pc
 		 renderproto.pc
 		 resourceproto.pc
 		 scrnsaverproto.pc
+		 specs/Makefile
+		 specs/bigreqsproto/Makefile
+		 specs/fontsproto/Makefile
+		 specs/kbproto/Makefile
+		 specs/recordproto/Makefile
+		 specs/scrnsaverproto/Makefile
+		 specs/xcmiscproto/Makefile
+		 specs/xextproto/Makefile
+		 specs/xproto/Makefile
 		 trapproto.pc
 		 videoproto.pc
 		 windowswmproto.pc

docbook.am

+#
+# Generate output formats for a single DocBook/XML with/without chapters
+#
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook:  the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
+#
+
+#
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA =
+
+# DocBook/XML file with chapters, appendix and images it includes
+dist_shelf_DATA = $(docbook) $(chapters)
+
+if HAVE_XMLTO
+if HAVE_STYLESHEETS
+
+XMLTO_SEARCHPATH_FLAGS = 				\
+	--searchpath "$(XORG_SGML_PATH)/X11" 		\
+	--searchpath "$(abs_top_builddir)"
+XMLTO_HTML_OLINK_FLAGS = \
+	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
+	--stringparam current.docid="$(<:.xml=)"
+XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XMLTO_HTML_FLAGS = 					\
+	$(XMLTO_SEARCHPATH_FLAGS)			\
+	$(XMLTO_HTML_STYLESHEET_FLAGS)			\
+	$(XMLTO_HTML_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_XMLTO_TEXT
+
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+if HAVE_FOP
+XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
+XMLTO_PDF_OLINK_FLAGS = \
+	--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+	--stringparam current.docid="$(<:.xml=)"
+XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+XMLTO_FO_FLAGS = 					\
+	$(XMLTO_SEARCHPATH_FLAGS)			\
+	$(XMLTO_FO_STYLESHEET_FLAGS)			\
+	$(XMLTO_FO_IMAGEPATH_FLAGS)			\
+	$(XMLTO_PDF_OLINK_FLAGS)
+
+shelf_DATA += $(docbook:.xml=.pdf)
+%.pdf: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+
+shelf_DATA += $(docbook:.xml=.ps)
+%.ps: %.xml $(chapters)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+# Generate documents cross-reference target databases
+if HAVE_XSLTPROC
+
+XSLT_SEARCHPATH_FLAGS = 				\
+	--path "$(XORG_SGML_PATH)/X11"			\
+	--path "$(abs_top_builddir)"
+XSLT_OLINK_FLAGS = 					\
+	--stringparam targets.filename "$@" 		\
+	--stringparam collect.xref.targets "only" 	\
+	--stringparam olink.base.uri "$(@:.db=)"
+
+XSLT_HTML_FLAGS =					\
+	$(XSLT_SEARCHPATH_FLAGS) 			\
+	$(XSLT_OLINK_FLAGS)				\
+	--nonet --xinclude				\
+	$(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
+XSLT_PDF_FLAGS = 					\
+	$(XSLT_SEARCHPATH_FLAGS) 			\
+	$(XSLT_OLINK_FLAGS)				\
+	--nonet --xinclude				\
+	$(STYLESHEET_SRCDIR)/xorg-fo.xsl
+
+shelf_DATA += $(docbook:.xml=.html.db)
+%.html.db: %.xml  $(chapters)
+	$(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
+
+shelf_DATA += $(docbook:.xml=.pdf.db)
+%.pdf.db: %.xml $(chapters)
+	$(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
+
+CLEANFILES = $(shelf_DATA)

specs/Makefile.am

+SUBDIRS = \
+    bigreqsproto \
+    fontsproto \
+    kbproto \
+    recordproto \
+    scrnsaverproto \
+    xcmiscproto \
+    xextproto \
+    xproto
+
+EXTRA_DIST = \
+    printproto/xp_proto.book \
+    printproto/xp_proto.mif \
+    printproto/xp_proto.ps \
+    printproto/xp_protoIX.doc \
+    printproto/xp_protoTOC.doc \
+    printproto/xp_proto_cov.mif \
+    SIAddresses/hostname.txt \
+    SIAddresses/IPv6.txt \
+    SIAddresses/localuser.txt \
+    SIAddresses/README

specs/bigreqsproto/Makefile.am

+
+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = bigreq.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/bigreqsproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS

specs/fontsproto/Makefile.am

+
+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = fsproto.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/fontsproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS

specs/kbproto/Makefile.am

+
+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = xkbproto.xml
+
+# Included chapters, appendix, images
+chapters = 			\
+	acknowledgements.xml	\
+	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		\
+	XKBproto-1.svg		\
+	XKBproto-2.svg		\
+	XKBproto-3.svg		\
+	XKBproto-4.svg		\
+	XKBproto-5.svg		\
+	XKBproto-6.svg		\
+	XKBproto-7.svg		\
+	XKBproto-8.svg		\
+	XKBproto-9.svg		\
+	XKBproto-10.svg		\
+	XKBproto-11.svg
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/kbproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS

specs/recordproto/Makefile.am

+
+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = record.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/recordproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS

specs/scrnsaverproto/Makefile.am

+
+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = saver.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/scrnsaverproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS

specs/xcmiscproto/Makefile.am

+
+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = xc-misc.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/xcmiscproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS

specs/xextproto/Makefile.am

+
+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = 		\
+	appgrp.xml	\
+	dbe.xml		\
+	dpms.xml	\
+	evi.xml		\
+	geproto.xml	\
+	lbx.xml		\
+	multibuf.xml	\
+	security.xml	\
+	shape.xml	\
+	shm.xml		\
+	sync.xml	\
+	tog-cup.xml	\
+	xtest.xml
+
+# Included chapters, appendix, images
+chapters = appendix.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/xextproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS

specs/xproto/Makefile.am

+if ENABLE_SPECS
+
+# Main DocBook/XML files (DOCTYPE book)
+docbook = x11protocol.xml
+
+# Included chapters, appendix, images
+chapters = 		\
+	encoding.xml	\
+	glossary.xml	\
+	keysyms.xml	\
+	sect1-9.xml
+
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(datarootdir)/doc/xproto
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif ENABLE_SPECS