diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-03-15 15:43:48 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-03-16 13:02:32 -0400 |
| commit | 0ac450f47c55fb2bac394f6377f1aabde1ab8429 (patch) | |
| tree | ecb4d6948a6a3ba3c7b67203caaba87497071f13 | |
| parent | f21f00bd9b8e641d639d70d086df1b14faa34e38 (diff) | |
specs: convert XI2proto.txt to html using asciidoc
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | specs/.gitignore | 1 | ||||
| -rw-r--r-- | specs/Makefile.am | 16 | ||||
| -rw-r--r-- | specs/XI2proto.txt (renamed from XI2proto.txt) | 0 | ||||
| -rw-r--r-- | specs/XIproto.txt (renamed from XIproto.txt) | 0 |
6 files changed, 26 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 77d1ea7..3312f2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,6 @@ + +SUBDIRS = specs + inputdir = $(includedir)/X11/extensions input_HEADERS = \ XI.h \ @@ -8,9 +11,6 @@ input_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = inputproto.pc -dist_doc_DATA = XI2proto.txt XIproto.txt - - MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 39e4df9..bd5f046 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,14 @@ AC_INIT([InputProto], [2.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?produ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros: XORG_WITH_ASCIIDOC m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS +XORG_ENABLE_SPECS +XORG_WITH_ASCIIDOC(8.4.5) AC_OUTPUT([Makefile + specs/Makefile inputproto.pc]) diff --git a/specs/.gitignore b/specs/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/specs/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/specs/Makefile.am b/specs/Makefile.am new file mode 100644 index 0000000..ad51453 --- /dev/null +++ b/specs/Makefile.am @@ -0,0 +1,16 @@ + +if ENABLE_SPECS +if HAVE_ASCIIDOC + +doc_DATA = XI2proto.html +dist_doc_DATA = XI2proto.txt + +%.html: %.txt + $(AM_V_GEN)$(ASCIIDOC) -o $@ $< + +CLEANFILES = $(doc_DATA) + +EXTRA_DIST = XIproto.txt + +endif +endif diff --git a/XI2proto.txt b/specs/XI2proto.txt index 5d1b275..5d1b275 100644 --- a/XI2proto.txt +++ b/specs/XI2proto.txt diff --git a/XIproto.txt b/specs/XIproto.txt index 83cf9dd..83cf9dd 100644 --- a/XIproto.txt +++ b/specs/XIproto.txt |