[PATCH inputproto] Prototype asciidoc text to html converter - not for review yet

[Peter Hutterer]

On Tue, Mar 15, 2011 at 03:51:54PM -0400, Gaetan Nadon wrote:
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  Makefile.am                        |    6 +++---
>  configure.ac                       |    9 ++++++---
>  specs/.gitignore                   |    1 +
>  specs/Makefile.am                  |   12 ++++++++++++
>  XI2proto.txt => specs/XI2proto.txt |    0
>  XIproto.txt => specs/XIproto.txt   |    0
>  6 files changed, 22 insertions(+), 6 deletions(-)
>  create mode 100644 specs/.gitignore
>  create mode 100644 specs/Makefile.am
>  rename XI2proto.txt => specs/XI2proto.txt (100%)
>  rename XIproto.txt => specs/XIproto.txt (100%)
> 
> 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..67a940d 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])

s/tab/spaces/

the rest of it looks good though

Cheers,
  Peter

> 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..69c53ad
> --- /dev/null
> +++ b/specs/Makefile.am
> @@ -0,0 +1,12 @@
> +
> +if ENABLE_SPECS
> +if HAVE_ASCIIDOC
> +
> +doc_DATA = XI2proto.html
> +dist_doc_DATA = XI2proto.txt
> +
> +%.html: %.txt
> +	$(AM_V_GEN)$(ASCIIDOC) -o $@ $<
> +
> +endif
> +endif
> diff --git a/XI2proto.txt b/specs/XI2proto.txt
> similarity index 100%
> rename from XI2proto.txt
> rename to specs/XI2proto.txt
> diff --git a/XIproto.txt b/specs/XIproto.txt
> similarity index 100%
> rename from XIproto.txt
> rename to specs/XIproto.txt
> -- 
> 1.6.0.4
>