xorgproto: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Feb 23 23:23:06 UTC 2019
Makefile.am | 10 ---
configure.ac | 9 +++
docbook.am | 105 +++++++++++++++++++++++++++++++++++++++
specs/Makefile.am | 21 +++++++
specs/bigreqsproto/Makefile.am | 13 ++++
specs/fontsproto/Makefile.am | 13 ++++
specs/kbproto/Makefile.am | 48 +++++++++++++++++
specs/recordproto/Makefile.am | 13 ++++
specs/scrnsaverproto/Makefile.am | 13 ++++
specs/xcmiscproto/Makefile.am | 13 ++++
specs/xextproto/Makefile.am | 29 ++++++++++
specs/xproto/Makefile.am | 19 +++++++
12 files changed, 298 insertions(+), 8 deletions(-)
New commits:
commit 4feff33159efb139ddb89a90fb26ad646b288f2b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Feb 23 13:33:41 2019 -0800
Restore generation of specs from docbook in autotools builds
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/Makefile.am b/Makefile.am
index 574f7be..9906ca2 100644
--- a/Makefile.am
+++ b/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
diff --git a/configure.ac b/configure.ac
index b28448a..d7fedb0 100644
--- a/configure.ac
+++ b/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
diff --git a/docbook.am b/docbook.am
new file mode 100644
index 0000000..bba4d54
--- /dev/null
+++ b/docbook.am
@@ -0,0 +1,105 @@
+#
+# 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)
diff --git a/specs/Makefile.am b/specs/Makefile.am
new file mode 100644
index 0000000..f3d77ba
--- /dev/null
+++ b/specs/Makefile.am
@@ -0,0 +1,21 @@
+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
diff --git a/specs/bigreqsproto/Makefile.am b/specs/bigreqsproto/Makefile.am
new file mode 100644
index 0000000..7115fad
--- /dev/null
+++ b/specs/bigreqsproto/Makefile.am
@@ -0,0 +1,13 @@
+
+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
diff --git a/specs/bigreq.xml b/specs/bigreqsproto/bigreq.xml
similarity index 100%
rename from specs/bigreq.xml
rename to specs/bigreqsproto/bigreq.xml
diff --git a/specs/fontsproto/Makefile.am b/specs/fontsproto/Makefile.am
new file mode 100644
index 0000000..7cc8a57
--- /dev/null
+++ b/specs/fontsproto/Makefile.am
@@ -0,0 +1,13 @@
+
+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
diff --git a/specs/fsproto.xml b/specs/fontsproto/fsproto.xml
similarity index 100%
rename from specs/fsproto.xml
rename to specs/fontsproto/fsproto.xml
diff --git a/specs/kbproto/Makefile.am b/specs/kbproto/Makefile.am
new file mode 100644
index 0000000..05719a9
--- /dev/null
+++ b/specs/kbproto/Makefile.am
@@ -0,0 +1,48 @@
+
+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
diff --git a/specs/XKBproto-1.svg b/specs/kbproto/XKBproto-1.svg
similarity index 100%
rename from specs/XKBproto-1.svg
rename to specs/kbproto/XKBproto-1.svg
diff --git a/specs/XKBproto-10.svg b/specs/kbproto/XKBproto-10.svg
similarity index 100%
rename from specs/XKBproto-10.svg
rename to specs/kbproto/XKBproto-10.svg
diff --git a/specs/XKBproto-11.svg b/specs/kbproto/XKBproto-11.svg
similarity index 100%
rename from specs/XKBproto-11.svg
rename to specs/kbproto/XKBproto-11.svg
diff --git a/specs/XKBproto-2.svg b/specs/kbproto/XKBproto-2.svg
similarity index 100%
rename from specs/XKBproto-2.svg
rename to specs/kbproto/XKBproto-2.svg
diff --git a/specs/XKBproto-3.svg b/specs/kbproto/XKBproto-3.svg
similarity index 100%
rename from specs/XKBproto-3.svg
rename to specs/kbproto/XKBproto-3.svg
diff --git a/specs/XKBproto-4.svg b/specs/kbproto/XKBproto-4.svg
similarity index 100%
rename from specs/XKBproto-4.svg
rename to specs/kbproto/XKBproto-4.svg
diff --git a/specs/XKBproto-5.svg b/specs/kbproto/XKBproto-5.svg
similarity index 100%
rename from specs/XKBproto-5.svg
rename to specs/kbproto/XKBproto-5.svg
diff --git a/specs/XKBproto-6.svg b/specs/kbproto/XKBproto-6.svg
similarity index 100%
rename from specs/XKBproto-6.svg
rename to specs/kbproto/XKBproto-6.svg
diff --git a/specs/XKBproto-7.svg b/specs/kbproto/XKBproto-7.svg
similarity index 100%
rename from specs/XKBproto-7.svg
rename to specs/kbproto/XKBproto-7.svg
diff --git a/specs/XKBproto-8.svg b/specs/kbproto/XKBproto-8.svg
similarity index 100%
rename from specs/XKBproto-8.svg
rename to specs/kbproto/XKBproto-8.svg
diff --git a/specs/XKBproto-9.svg b/specs/kbproto/XKBproto-9.svg
similarity index 100%
rename from specs/XKBproto-9.svg
rename to specs/kbproto/XKBproto-9.svg
diff --git a/specs/acknowledgements.xml b/specs/kbproto/acknowledgements.xml
similarity index 100%
rename from specs/acknowledgements.xml
rename to specs/kbproto/acknowledgements.xml
diff --git a/specs/appA.xml b/specs/kbproto/appA.xml
similarity index 100%
rename from specs/appA.xml
rename to specs/kbproto/appA.xml
diff --git a/specs/appB.xml b/specs/kbproto/appB.xml
similarity index 100%
rename from specs/appB.xml
rename to specs/kbproto/appB.xml
diff --git a/specs/appC.xml b/specs/kbproto/appC.xml
similarity index 100%
rename from specs/appC.xml
rename to specs/kbproto/appC.xml
diff --git a/specs/appD.xml b/specs/kbproto/appD.xml
similarity index 100%
rename from specs/appD.xml
rename to specs/kbproto/appD.xml
diff --git a/specs/ch01.xml b/specs/kbproto/ch01.xml
similarity index 100%
rename from specs/ch01.xml
rename to specs/kbproto/ch01.xml
diff --git a/specs/ch02.xml b/specs/kbproto/ch02.xml
similarity index 100%
rename from specs/ch02.xml
rename to specs/kbproto/ch02.xml
diff --git a/specs/ch03.xml b/specs/kbproto/ch03.xml
similarity index 100%
rename from specs/ch03.xml
rename to specs/kbproto/ch03.xml
diff --git a/specs/ch04.xml b/specs/kbproto/ch04.xml
similarity index 100%
rename from specs/ch04.xml
rename to specs/kbproto/ch04.xml
diff --git a/specs/ch05.xml b/specs/kbproto/ch05.xml
similarity index 100%
rename from specs/ch05.xml
rename to specs/kbproto/ch05.xml
diff --git a/specs/ch06.xml b/specs/kbproto/ch06.xml
similarity index 100%
rename from specs/ch06.xml
rename to specs/kbproto/ch06.xml
diff --git a/specs/ch07.xml b/specs/kbproto/ch07.xml
similarity index 100%
rename from specs/ch07.xml
rename to specs/kbproto/ch07.xml
diff --git a/specs/ch08.xml b/specs/kbproto/ch08.xml
similarity index 100%
rename from specs/ch08.xml
rename to specs/kbproto/ch08.xml
diff --git a/specs/ch09.xml b/specs/kbproto/ch09.xml
similarity index 100%
rename from specs/ch09.xml
rename to specs/kbproto/ch09.xml
diff --git a/specs/ch10.xml b/specs/kbproto/ch10.xml
similarity index 100%
rename from specs/ch10.xml
rename to specs/kbproto/ch10.xml
diff --git a/specs/ch11.xml b/specs/kbproto/ch11.xml
similarity index 100%
rename from specs/ch11.xml
rename to specs/kbproto/ch11.xml
diff --git a/specs/ch12.xml b/specs/kbproto/ch12.xml
similarity index 100%
rename from specs/ch12.xml
rename to specs/kbproto/ch12.xml
diff --git a/specs/ch13.xml b/specs/kbproto/ch13.xml
similarity index 100%
rename from specs/ch13.xml
rename to specs/kbproto/ch13.xml
diff --git a/specs/ch14.xml b/specs/kbproto/ch14.xml
similarity index 100%
rename from specs/ch14.xml
rename to specs/kbproto/ch14.xml
diff --git a/specs/ch15.xml b/specs/kbproto/ch15.xml
similarity index 100%
rename from specs/ch15.xml
rename to specs/kbproto/ch15.xml
diff --git a/specs/ch16.xml b/specs/kbproto/ch16.xml
similarity index 100%
rename from specs/ch16.xml
rename to specs/kbproto/ch16.xml
diff --git a/specs/xkbproto.xml b/specs/kbproto/xkbproto.xml
similarity index 100%
rename from specs/xkbproto.xml
rename to specs/kbproto/xkbproto.xml
diff --git a/specs/xp_proto.book b/specs/printproto/xp_proto.book
similarity index 100%
rename from specs/xp_proto.book
rename to specs/printproto/xp_proto.book
diff --git a/specs/xp_proto.mif b/specs/printproto/xp_proto.mif
similarity index 100%
rename from specs/xp_proto.mif
rename to specs/printproto/xp_proto.mif
diff --git a/specs/xp_proto.ps b/specs/printproto/xp_proto.ps
similarity index 100%
rename from specs/xp_proto.ps
rename to specs/printproto/xp_proto.ps
diff --git a/specs/xp_protoIX.doc b/specs/printproto/xp_protoIX.doc
similarity index 100%
rename from specs/xp_protoIX.doc
rename to specs/printproto/xp_protoIX.doc
diff --git a/specs/xp_protoTOC.doc b/specs/printproto/xp_protoTOC.doc
similarity index 100%
rename from specs/xp_protoTOC.doc
rename to specs/printproto/xp_protoTOC.doc
diff --git a/specs/xp_proto_cov.mif b/specs/printproto/xp_proto_cov.mif
similarity index 100%
rename from specs/xp_proto_cov.mif
rename to specs/printproto/xp_proto_cov.mif
diff --git a/specs/recordproto/Makefile.am b/specs/recordproto/Makefile.am
new file mode 100644
index 0000000..499f04e
--- /dev/null
+++ b/specs/recordproto/Makefile.am
@@ -0,0 +1,13 @@
+
+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
diff --git a/specs/record.xml b/specs/recordproto/record.xml
similarity index 100%
rename from specs/record.xml
rename to specs/recordproto/record.xml
diff --git a/specs/scrnsaverproto/Makefile.am b/specs/scrnsaverproto/Makefile.am
new file mode 100644
index 0000000..ad4b871
--- /dev/null
+++ b/specs/scrnsaverproto/Makefile.am
@@ -0,0 +1,13 @@
+
+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
diff --git a/specs/saver.xml b/specs/scrnsaverproto/saver.xml
similarity index 100%
rename from specs/saver.xml
rename to specs/scrnsaverproto/saver.xml
diff --git a/specs/xcmiscproto/Makefile.am b/specs/xcmiscproto/Makefile.am
new file mode 100644
index 0000000..e2dfc61
--- /dev/null
+++ b/specs/xcmiscproto/Makefile.am
@@ -0,0 +1,13 @@
+
+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
diff --git a/specs/xc-misc.xml b/specs/xcmiscproto/xc-misc.xml
similarity index 100%
rename from specs/xc-misc.xml
rename to specs/xcmiscproto/xc-misc.xml
diff --git a/specs/xextproto/Makefile.am b/specs/xextproto/Makefile.am
new file mode 100644
index 0000000..947686f
--- /dev/null
+++ b/specs/xextproto/Makefile.am
@@ -0,0 +1,29 @@
+
+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
diff --git a/specs/appendix.xml b/specs/xextproto/appendix.xml
similarity index 100%
rename from specs/appendix.xml
rename to specs/xextproto/appendix.xml
diff --git a/specs/appgrp.xml b/specs/xextproto/appgrp.xml
similarity index 100%
rename from specs/appgrp.xml
rename to specs/xextproto/appgrp.xml
diff --git a/specs/dbe.xml b/specs/xextproto/dbe.xml
similarity index 100%
rename from specs/dbe.xml
rename to specs/xextproto/dbe.xml
diff --git a/specs/dpms.xml b/specs/xextproto/dpms.xml
similarity index 100%
rename from specs/dpms.xml
rename to specs/xextproto/dpms.xml
diff --git a/specs/evi.xml b/specs/xextproto/evi.xml
similarity index 100%
rename from specs/evi.xml
rename to specs/xextproto/evi.xml
diff --git a/specs/geproto.xml b/specs/xextproto/geproto.xml
similarity index 100%
rename from specs/geproto.xml
rename to specs/xextproto/geproto.xml
diff --git a/specs/lbx.xml b/specs/xextproto/lbx.xml
similarity index 100%
rename from specs/lbx.xml
rename to specs/xextproto/lbx.xml
diff --git a/specs/multibuf.xml b/specs/xextproto/multibuf.xml
similarity index 100%
rename from specs/multibuf.xml
rename to specs/xextproto/multibuf.xml
diff --git a/specs/security.xml b/specs/xextproto/security.xml
similarity index 100%
rename from specs/security.xml
rename to specs/xextproto/security.xml
diff --git a/specs/shape.xml b/specs/xextproto/shape.xml
similarity index 100%
rename from specs/shape.xml
rename to specs/xextproto/shape.xml
diff --git a/specs/shm.xml b/specs/xextproto/shm.xml
similarity index 100%
rename from specs/shm.xml
rename to specs/xextproto/shm.xml
diff --git a/specs/sync.xml b/specs/xextproto/sync.xml
similarity index 100%
rename from specs/sync.xml
rename to specs/xextproto/sync.xml
diff --git a/specs/tog-cup.xml b/specs/xextproto/tog-cup.xml
similarity index 100%
rename from specs/tog-cup.xml
rename to specs/xextproto/tog-cup.xml
diff --git a/specs/xtest.xml b/specs/xextproto/xtest.xml
similarity index 100%
rename from specs/xtest.xml
rename to specs/xextproto/xtest.xml
diff --git a/specs/xproto/Makefile.am b/specs/xproto/Makefile.am
new file mode 100644
index 0000000..bf20b99
--- /dev/null
+++ b/specs/xproto/Makefile.am
@@ -0,0 +1,19 @@
+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
diff --git a/specs/encoding.xml b/specs/xproto/encoding.xml
similarity index 100%
rename from specs/encoding.xml
rename to specs/xproto/encoding.xml
diff --git a/specs/glossary.xml b/specs/xproto/glossary.xml
similarity index 100%
rename from specs/glossary.xml
rename to specs/xproto/glossary.xml
diff --git a/specs/keysyms.xml b/specs/xproto/keysyms.xml
similarity index 100%
rename from specs/keysyms.xml
rename to specs/xproto/keysyms.xml
diff --git a/specs/sect1-9.xml b/specs/xproto/sect1-9.xml
similarity index 100%
rename from specs/sect1-9.xml
rename to specs/xproto/sect1-9.xml
diff --git a/specs/x11protocol.xml b/specs/xproto/x11protocol.xml
similarity index 100%
rename from specs/x11protocol.xml
rename to specs/xproto/x11protocol.xml
More information about the xorg-commit
mailing list