[Spice-commits] configure.ac docs/manual

[Christophe Fergau]

 configure.ac            |    7 ++++++-
 docs/manual/Makefile.am |   16 ++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 37bf7a516353b323a56ceec820930edef9f784f9
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Tue Mar 25 14:08:04 2014 +0100

    doc: Generate chunked manual
    
    This commit makes use of a2x in order to generate a chunked manual in
    addition to the "all in one page" one.

diff --git a/configure.ac b/configure.ac
index 53d05a2..e4ba9b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,9 +425,14 @@ if test "x$enable_manual" != "xno"; then
     AC_PATH_PROG([ASCIIDOC], [asciidoc])
     AS_IF([test -z "$ASCIIDOC" && test "x$enable_manual" = "xyes"],
           [AC_MSG_ERROR([asciidoc is missing and build of manual was requested])])
+    AC_PATH_PROG([A2X], [a2x])
+    AS_IF([test -z "$A2X" && test "x$enable_manual" = "xyes"],
+          [AC_MSG_ERROR([a2x is missing and build of manual was requested])])
 fi
 AS_IF([test -n "$ASCIIDOC"], [have_asciidoc=yes], [have_asciidoc=no])
-AM_CONDITIONAL([BUILD_MANUAL], [test -n "$ASCIIDOC"])
+AM_CONDITIONAL([BUILD_MANUAL], [test -n "$ASCIIDOC" || test -n "$A2X"])
+AM_CONDITIONAL([BUILD_HTML_MANUAL], [test -n "$ASCIIDOC"])
+AM_CONDITIONAL([BUILD_CHUNKED_MANUAL], [test -n "$A2X"])
 
 
 dnl ===========================================================================
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index f464e7a..54e33e1 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -7,13 +7,25 @@ EXTRA_DIST =					\
 	images/icons/*.png			\
 	images/spicec01.png			\
 	manual.html				\
+	manual.chunked				\
 	manual.txt				\
 	$(NULL)
 
 .txt.html:
 	$(AM_V_GEN) $(ASCIIDOC) $(ASCIIDOC_FLAGS) $<
 
-all-local: manual.html
+manual.chunked: manual.txt
+	$(AM_V_GEN) $(A2X) -f chunked -D $(builddir) $(ASCIIDOC_FLAGS) $<
+
+docfiles =
+if BUILD_HTML_MANUAL
+docfiles += manual.html
+endif
+if BUILD_CHUNKED_MANUAL
+docfiles += manual.chunked
+endif
+
+all-local: $(docfiles)
 
 clean-local:
-	rm manual.html
+	rm -rf manual.chunked