diff options
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | docbook.am | 105 | ||||
-rw-r--r-- | specs/Makefile.am | 21 | ||||
-rw-r--r-- | specs/bigreqsproto/Makefile.am | 13 | ||||
-rw-r--r-- | specs/bigreqsproto/bigreq.xml (renamed from specs/bigreq.xml) | 0 | ||||
-rw-r--r-- | specs/fontsproto/Makefile.am | 13 | ||||
-rw-r--r-- | specs/fontsproto/fsproto.xml (renamed from specs/fsproto.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/Makefile.am | 48 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-1.svg (renamed from specs/XKBproto-1.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-10.svg (renamed from specs/XKBproto-10.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-11.svg (renamed from specs/XKBproto-11.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-2.svg (renamed from specs/XKBproto-2.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-3.svg (renamed from specs/XKBproto-3.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-4.svg (renamed from specs/XKBproto-4.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-5.svg (renamed from specs/XKBproto-5.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-6.svg (renamed from specs/XKBproto-6.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-7.svg (renamed from specs/XKBproto-7.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-8.svg (renamed from specs/XKBproto-8.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/XKBproto-9.svg (renamed from specs/XKBproto-9.svg) | 0 | ||||
-rw-r--r-- | specs/kbproto/acknowledgements.xml (renamed from specs/acknowledgements.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/appA.xml (renamed from specs/appA.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/appB.xml (renamed from specs/appB.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/appC.xml (renamed from specs/appC.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/appD.xml (renamed from specs/appD.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch01.xml (renamed from specs/ch01.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch02.xml (renamed from specs/ch02.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch03.xml (renamed from specs/ch03.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch04.xml (renamed from specs/ch04.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch05.xml (renamed from specs/ch05.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch06.xml (renamed from specs/ch06.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch07.xml (renamed from specs/ch07.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch08.xml (renamed from specs/ch08.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch09.xml (renamed from specs/ch09.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch10.xml (renamed from specs/ch10.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch11.xml (renamed from specs/ch11.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch12.xml (renamed from specs/ch12.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch13.xml (renamed from specs/ch13.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch14.xml (renamed from specs/ch14.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch15.xml (renamed from specs/ch15.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/ch16.xml (renamed from specs/ch16.xml) | 0 | ||||
-rw-r--r-- | specs/kbproto/xkbproto.xml (renamed from specs/xkbproto.xml) | 0 | ||||
-rw-r--r-- | specs/printproto/xp_proto.book (renamed from specs/xp_proto.book) | bin | 22528 -> 22528 bytes | |||
-rw-r--r-- | specs/printproto/xp_proto.mif (renamed from specs/xp_proto.mif) | 0 | ||||
-rw-r--r-- | specs/printproto/xp_proto.ps (renamed from specs/xp_proto.ps) | 0 | ||||
-rw-r--r-- | specs/printproto/xp_protoIX.doc (renamed from specs/xp_protoIX.doc) | bin | 34816 -> 34816 bytes | |||
-rw-r--r-- | specs/printproto/xp_protoTOC.doc (renamed from specs/xp_protoTOC.doc) | bin | 19456 -> 19456 bytes | |||
-rw-r--r-- | specs/printproto/xp_proto_cov.mif (renamed from specs/xp_proto_cov.mif) | 0 | ||||
-rw-r--r-- | specs/recordproto/Makefile.am | 13 | ||||
-rw-r--r-- | specs/recordproto/record.xml (renamed from specs/record.xml) | 0 | ||||
-rw-r--r-- | specs/scrnsaverproto/Makefile.am | 13 | ||||
-rw-r--r-- | specs/scrnsaverproto/saver.xml (renamed from specs/saver.xml) | 0 | ||||
-rw-r--r-- | specs/xcmiscproto/Makefile.am | 13 | ||||
-rw-r--r-- | specs/xcmiscproto/xc-misc.xml (renamed from specs/xc-misc.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/Makefile.am | 29 | ||||
-rw-r--r-- | specs/xextproto/appendix.xml (renamed from specs/appendix.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/appgrp.xml (renamed from specs/appgrp.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/dbe.xml (renamed from specs/dbe.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/dpms.xml (renamed from specs/dpms.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/evi.xml (renamed from specs/evi.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/geproto.xml (renamed from specs/geproto.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/lbx.xml (renamed from specs/lbx.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/multibuf.xml (renamed from specs/multibuf.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/security.xml (renamed from specs/security.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/shape.xml (renamed from specs/shape.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/shm.xml (renamed from specs/shm.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/sync.xml (renamed from specs/sync.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/tog-cup.xml (renamed from specs/tog-cup.xml) | 0 | ||||
-rw-r--r-- | specs/xextproto/xtest.xml (renamed from specs/xtest.xml) | 0 | ||||
-rw-r--r-- | specs/xproto/Makefile.am | 19 | ||||
-rw-r--r-- | specs/xproto/encoding.xml (renamed from specs/encoding.xml) | 0 | ||||
-rw-r--r-- | specs/xproto/glossary.xml (renamed from specs/glossary.xml) | 0 | ||||
-rw-r--r-- | specs/xproto/keysyms.xml (renamed from specs/keysyms.xml) | 0 | ||||
-rw-r--r-- | specs/xproto/sect1-9.xml (renamed from specs/sect1-9.xml) | 0 | ||||
-rw-r--r-- | specs/xproto/x11protocol.xml (renamed from specs/x11protocol.xml) | 0 |
75 files changed, 298 insertions, 8 deletions
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 index 1d1d84d..1d1d84d 100644 --- a/specs/bigreq.xml +++ b/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 index 74f2428..74f2428 100644 --- a/specs/fsproto.xml +++ b/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 index 1f8ba5b..1f8ba5b 100644 --- a/specs/XKBproto-1.svg +++ b/specs/kbproto/XKBproto-1.svg diff --git a/specs/XKBproto-10.svg b/specs/kbproto/XKBproto-10.svg index 7660079..7660079 100644 --- a/specs/XKBproto-10.svg +++ b/specs/kbproto/XKBproto-10.svg diff --git a/specs/XKBproto-11.svg b/specs/kbproto/XKBproto-11.svg index fa334de..fa334de 100644 --- a/specs/XKBproto-11.svg +++ b/specs/kbproto/XKBproto-11.svg diff --git a/specs/XKBproto-2.svg b/specs/kbproto/XKBproto-2.svg index 495be15..495be15 100644 --- a/specs/XKBproto-2.svg +++ b/specs/kbproto/XKBproto-2.svg diff --git a/specs/XKBproto-3.svg b/specs/kbproto/XKBproto-3.svg index 30744c5..30744c5 100644 --- a/specs/XKBproto-3.svg +++ b/specs/kbproto/XKBproto-3.svg diff --git a/specs/XKBproto-4.svg b/specs/kbproto/XKBproto-4.svg index f5578d3..f5578d3 100644 --- a/specs/XKBproto-4.svg +++ b/specs/kbproto/XKBproto-4.svg diff --git a/specs/XKBproto-5.svg b/specs/kbproto/XKBproto-5.svg index 0deeacc..0deeacc 100644 --- a/specs/XKBproto-5.svg +++ b/specs/kbproto/XKBproto-5.svg diff --git a/specs/XKBproto-6.svg b/specs/kbproto/XKBproto-6.svg index a274f2b..a274f2b 100644 --- a/specs/XKBproto-6.svg +++ b/specs/kbproto/XKBproto-6.svg diff --git a/specs/XKBproto-7.svg b/specs/kbproto/XKBproto-7.svg index 82b80a6..82b80a6 100644 --- a/specs/XKBproto-7.svg +++ b/specs/kbproto/XKBproto-7.svg diff --git a/specs/XKBproto-8.svg b/specs/kbproto/XKBproto-8.svg index 8baa3e3..8baa3e3 100644 --- a/specs/XKBproto-8.svg +++ b/specs/kbproto/XKBproto-8.svg diff --git a/specs/XKBproto-9.svg b/specs/kbproto/XKBproto-9.svg index 8baa3e3..8baa3e3 100644 --- a/specs/XKBproto-9.svg +++ b/specs/kbproto/XKBproto-9.svg diff --git a/specs/acknowledgements.xml b/specs/kbproto/acknowledgements.xml index 95b9521..95b9521 100644 --- a/specs/acknowledgements.xml +++ b/specs/kbproto/acknowledgements.xml diff --git a/specs/appA.xml b/specs/kbproto/appA.xml index fd26bac..fd26bac 100644 --- a/specs/appA.xml +++ b/specs/kbproto/appA.xml diff --git a/specs/appB.xml b/specs/kbproto/appB.xml index 85137cf..85137cf 100644 --- a/specs/appB.xml +++ b/specs/kbproto/appB.xml diff --git a/specs/appC.xml b/specs/kbproto/appC.xml index 6e47cae..6e47cae 100644 --- a/specs/appC.xml +++ b/specs/kbproto/appC.xml diff --git a/specs/appD.xml b/specs/kbproto/appD.xml index 23aed05..23aed05 100644 --- a/specs/appD.xml +++ b/specs/kbproto/appD.xml diff --git a/specs/ch01.xml b/specs/kbproto/ch01.xml index 27dcc88..27dcc88 100644 --- a/specs/ch01.xml +++ b/specs/kbproto/ch01.xml diff --git a/specs/ch02.xml b/specs/kbproto/ch02.xml index 0234297..0234297 100644 --- a/specs/ch02.xml +++ b/specs/kbproto/ch02.xml diff --git a/specs/ch03.xml b/specs/kbproto/ch03.xml index d71f353..d71f353 100644 --- a/specs/ch03.xml +++ b/specs/kbproto/ch03.xml diff --git a/specs/ch04.xml b/specs/kbproto/ch04.xml index d35e2b4..d35e2b4 100644 --- a/specs/ch04.xml +++ b/specs/kbproto/ch04.xml diff --git a/specs/ch05.xml b/specs/kbproto/ch05.xml index 5669a39..5669a39 100644 --- a/specs/ch05.xml +++ b/specs/kbproto/ch05.xml diff --git a/specs/ch06.xml b/specs/kbproto/ch06.xml index ec6a5f2..ec6a5f2 100644 --- a/specs/ch06.xml +++ b/specs/kbproto/ch06.xml diff --git a/specs/ch07.xml b/specs/kbproto/ch07.xml index b5ffc68..b5ffc68 100644 --- a/specs/ch07.xml +++ b/specs/kbproto/ch07.xml diff --git a/specs/ch08.xml b/specs/kbproto/ch08.xml index 08524a8..08524a8 100644 --- a/specs/ch08.xml +++ b/specs/kbproto/ch08.xml diff --git a/specs/ch09.xml b/specs/kbproto/ch09.xml index d5f587b..d5f587b 100644 --- a/specs/ch09.xml +++ b/specs/kbproto/ch09.xml diff --git a/specs/ch10.xml b/specs/kbproto/ch10.xml index 74362b0..74362b0 100644 --- a/specs/ch10.xml +++ b/specs/kbproto/ch10.xml diff --git a/specs/ch11.xml b/specs/kbproto/ch11.xml index 39361a4..39361a4 100644 --- a/specs/ch11.xml +++ b/specs/kbproto/ch11.xml diff --git a/specs/ch12.xml b/specs/kbproto/ch12.xml index efc6d6a..efc6d6a 100644 --- a/specs/ch12.xml +++ b/specs/kbproto/ch12.xml diff --git a/specs/ch13.xml b/specs/kbproto/ch13.xml index 25fa96d..25fa96d 100644 --- a/specs/ch13.xml +++ b/specs/kbproto/ch13.xml diff --git a/specs/ch14.xml b/specs/kbproto/ch14.xml index 6a2f45a..6a2f45a 100644 --- a/specs/ch14.xml +++ b/specs/kbproto/ch14.xml diff --git a/specs/ch15.xml b/specs/kbproto/ch15.xml index d3e47d0..d3e47d0 100644 --- a/specs/ch15.xml +++ b/specs/kbproto/ch15.xml diff --git a/specs/ch16.xml b/specs/kbproto/ch16.xml index 6044843..6044843 100644 --- a/specs/ch16.xml +++ b/specs/kbproto/ch16.xml diff --git a/specs/xkbproto.xml b/specs/kbproto/xkbproto.xml index 20f98d5..20f98d5 100644 --- a/specs/xkbproto.xml +++ b/specs/kbproto/xkbproto.xml diff --git a/specs/xp_proto.book b/specs/printproto/xp_proto.book Binary files differindex c9b76e4..c9b76e4 100644 --- a/specs/xp_proto.book +++ b/specs/printproto/xp_proto.book diff --git a/specs/xp_proto.mif b/specs/printproto/xp_proto.mif index 3ff4705..3ff4705 100644 --- a/specs/xp_proto.mif +++ b/specs/printproto/xp_proto.mif diff --git a/specs/xp_proto.ps b/specs/printproto/xp_proto.ps index 47fad33..47fad33 100644 --- a/specs/xp_proto.ps +++ b/specs/printproto/xp_proto.ps diff --git a/specs/xp_protoIX.doc b/specs/printproto/xp_protoIX.doc Binary files differindex af3efa1..af3efa1 100644 --- a/specs/xp_protoIX.doc +++ b/specs/printproto/xp_protoIX.doc diff --git a/specs/xp_protoTOC.doc b/specs/printproto/xp_protoTOC.doc Binary files differindex 7154da3..7154da3 100644 --- a/specs/xp_protoTOC.doc +++ b/specs/printproto/xp_protoTOC.doc diff --git a/specs/xp_proto_cov.mif b/specs/printproto/xp_proto_cov.mif index cdc1310..cdc1310 100644 --- a/specs/xp_proto_cov.mif +++ b/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 index 842a5d6..842a5d6 100644 --- a/specs/record.xml +++ b/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 index 2374218..2374218 100644 --- a/specs/saver.xml +++ b/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 index f2dfec2..f2dfec2 100644 --- a/specs/xc-misc.xml +++ b/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 index b6c0f1d..b6c0f1d 100644 --- a/specs/appendix.xml +++ b/specs/xextproto/appendix.xml diff --git a/specs/appgrp.xml b/specs/xextproto/appgrp.xml index 0f91e16..0f91e16 100644 --- a/specs/appgrp.xml +++ b/specs/xextproto/appgrp.xml diff --git a/specs/dbe.xml b/specs/xextproto/dbe.xml index 5af90a6..5af90a6 100644 --- a/specs/dbe.xml +++ b/specs/xextproto/dbe.xml diff --git a/specs/dpms.xml b/specs/xextproto/dpms.xml index f504ab7..f504ab7 100644 --- a/specs/dpms.xml +++ b/specs/xextproto/dpms.xml diff --git a/specs/evi.xml b/specs/xextproto/evi.xml index 7b661f6..7b661f6 100644 --- a/specs/evi.xml +++ b/specs/xextproto/evi.xml diff --git a/specs/geproto.xml b/specs/xextproto/geproto.xml index 4cca9ac..4cca9ac 100644 --- a/specs/geproto.xml +++ b/specs/xextproto/geproto.xml diff --git a/specs/lbx.xml b/specs/xextproto/lbx.xml index 87060b7..87060b7 100644 --- a/specs/lbx.xml +++ b/specs/xextproto/lbx.xml diff --git a/specs/multibuf.xml b/specs/xextproto/multibuf.xml index 9e2b065..9e2b065 100644 --- a/specs/multibuf.xml +++ b/specs/xextproto/multibuf.xml diff --git a/specs/security.xml b/specs/xextproto/security.xml index 93073c5..93073c5 100644 --- a/specs/security.xml +++ b/specs/xextproto/security.xml diff --git a/specs/shape.xml b/specs/xextproto/shape.xml index 16751ff..16751ff 100644 --- a/specs/shape.xml +++ b/specs/xextproto/shape.xml diff --git a/specs/shm.xml b/specs/xextproto/shm.xml index f6ad347..f6ad347 100644 --- a/specs/shm.xml +++ b/specs/xextproto/shm.xml diff --git a/specs/sync.xml b/specs/xextproto/sync.xml index afb0783..afb0783 100644 --- a/specs/sync.xml +++ b/specs/xextproto/sync.xml diff --git a/specs/tog-cup.xml b/specs/xextproto/tog-cup.xml index a35ff8c..a35ff8c 100644 --- a/specs/tog-cup.xml +++ b/specs/xextproto/tog-cup.xml diff --git a/specs/xtest.xml b/specs/xextproto/xtest.xml index 4893b88..4893b88 100644 --- a/specs/xtest.xml +++ b/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 index 0c6ef02..0c6ef02 100644 --- a/specs/encoding.xml +++ b/specs/xproto/encoding.xml diff --git a/specs/glossary.xml b/specs/xproto/glossary.xml index 61233e3..61233e3 100644 --- a/specs/glossary.xml +++ b/specs/xproto/glossary.xml diff --git a/specs/keysyms.xml b/specs/xproto/keysyms.xml index e2fa0d0..e2fa0d0 100644 --- a/specs/keysyms.xml +++ b/specs/xproto/keysyms.xml diff --git a/specs/sect1-9.xml b/specs/xproto/sect1-9.xml index f8e8b7c..f8e8b7c 100644 --- a/specs/sect1-9.xml +++ b/specs/xproto/sect1-9.xml diff --git a/specs/x11protocol.xml b/specs/xproto/x11protocol.xml index 87ac555..87ac555 100644 --- a/specs/x11protocol.xml +++ b/specs/xproto/x11protocol.xml |