Changed around documentation building

AUTHORS

@@ -1,4 +1,3 @@
-
 MAST is written and maintained by:
 
 Nicholas Humfrey <njh@ecs.soton.ac.uk>

Makefile.am

@@ -4,6 +4,6 @@ VERSION: configure.ac
 	echo "${PACKAGE_NAME}" > VERSION; \
 	echo "${PACKAGE_VERSION}" >> VERSION
 
-SUBDIRS = libgsm src @BUILD_DOC@
+SUBDIRS = libgsm src doc
 EXTRA_DIST = VERSION TODO autogen.sh
 

configure.ac

@@ -47,12 +47,12 @@ AC_PATH_PROG( [XMLTO], [xmlto] )
 AC_SUBST( XMLTO )
 
 if test "x$ac_cv_path_ASCIIDOC" != "x" -a "x$ac_cv_path_XMLTO" != "x"; then
-	BUILD_DOC="doc"
+	BUILD_DOC="Yes"
 else
-	BUILD_DOC=""
-	AC_MSG_WARN([Not building documentation because tools are missing])
+	BUILD_DOC="No"
+	AC_MSG_WARN([Not re-building documentation because tools are missing])
 fi
-AC_SUBST( BUILD_DOC )
+AM_CONDITIONAL(BUILD_DOC, test x$BUILD_DOC = xYes)
 
 
 
@@ -139,6 +139,7 @@ echo "
   Copyright (C) 2003-2007 University of Southampton
 
   Install path .......... $prefix
+  Rebuilding Docs ....... $BUILD_DOC
   Debugging ............. $Debugging
   Jack Support .......... $HAVE_JACK
   Libsndfile support .... $HAVE_SNDFILE

doc/INSTALL.asc

@@ -1,4 +1,3 @@
-
 Installation of MAST
 ====================
 Nicholas J. Humfrey <njh@ecs.soton.ac.uk>

doc/Makefile.am

@@ -1,34 +1,37 @@
 
-ASCIIDOC = @ASCIIDOC@
-XMLTO = @XMLTO@
-
-man_MANS = mastcast.1 mastclient.1
-
+man_MANS = mast_cast.1 mast_client.1
 
+HTMLPAGES =  README.html INSTALL.html
 HTMLMANPAGES = $(man_MANS:%=%.html)
 XMLMANPAGES = $(man_MANS:%=%.xml)
 ASCMANPAGES = $(man_MANS:%=%.asc)
 
 
-noinst_DATA = $(HTMLMANPAGES) $(XMLMANPAGES) README.html INSTALL.html
+## Tool locations
+ASCIIDOC = @ASCIIDOC@
+XMLTO = @XMLTO@
+
 
-README.html: ../README
-	$(ASCIIDOC) -d article -b html -o $@ $<
-
-INSTALL.html: ../INSTALL
-	$(ASCIIDOC) -d article -b html -o $@ $<
+## Only re-build documentation if tools are available
+if BUILD_DOC 
 
+$(HTMLPAGES): %.html: %.asc
+	$(ASCIIDOC) -d article -b xhtml11 -o $@ $<
 
 $(HTMLMANPAGES): %.html: %.asc
-	$(ASCIIDOC) -d manpage -b html -o $@ $<
+	$(ASCIIDOC) -d manpage -b xhtml11 -o $@ $<
 
 $(XMLMANPAGES): %.xml: %.asc
 	$(ASCIIDOC) -d manpage -b docbook -o $@ $<
 
 $(man_MANS): %: %.xml
 	$(XMLTO) man $<
-
-CLEANFILES = $(man_MANS) $(HTMLMANPAGES) $(XMLMANPAGES) README.html INSTALL.html \
-			 manpage.links manpage.refs
 
-EXTRA_DIST = $(ASCMANPAGES)
+endif
+
+
+
+dist_doc_DATA = $(HTMLPAGES) $(HTMLMANPAGES)
+DISTCLEANFILES = $(man_MANS) $(HTMLMANPAGES)
+CLEANFILES = $(XMLMANPAGES) manpage.links manpage.refs
+EXTRA_DIST = $(ASCMANPAGES) $(man_MANS) $(HTMLPAGES) $(HTMLMANPAGES)