hal ChangeLog, 1.207, 1.208 Makefile.am, 1.5, 1.6 configure.in, 1.26, 1.27

[David Zeuthen]

Update of /cvs/hal/hal
In directory pdx:/tmp/cvs-serv32156

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
2004-07-22  David Zeuthen  <david at fubar.dk>

	Documentation love, part 1. Added the spec to the source tree because
	we want closer sync between code and spec. Also generate doxygen
	docs, but only for libhal.

	* Makefile.am: No longer reference Doxyfile

	* configure.in: Add a new option --enable-docbook-docs

	* doc/Makefile.am: Add spec to SUBDIRS

	* doc/api/Doxyfile.in: New file

	* doc/api/Makefile.am: New file

	* Doxyfile: Removed

	* Doxyfile.in: Removed

	* doc/spec/Makefile.am: New file

	* doc/spec/hal-arch.dia: New file

	* doc/spec/hal-arch.png: New file

	* doc/spec/hal-devices-virtual1.png: New file

	* doc/spec/hal-devices1.png: New file

	* doc/spec/hal-fdi-example1.png: New file

	* doc/spec/hal-sequence-diagram.dia: New file

	* doc/spec/hal-sequence-diagram.png: New file

	* doc/spec/hal-spec.html: New file

	* doc/spec/hal-spec.xml.in: New file

	* doc/spec/hal-volume-to-device.png: New file



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- ChangeLog	21 Jul 2004 22:32:16 -0000	1.207
+++ ChangeLog	21 Jul 2004 23:07:45 -0000	1.208
@@ -1,3 +1,45 @@
+2004-07-22  David Zeuthen  <david at fubar.dk>
+
+	Documentation love, part 1. Added the spec to the source tree because
+	we want closer sync between code and spec. Also generate doxygen
+	docs, but only for libhal.
+
+	* Makefile.am: No longer reference Doxyfile
+
+	* configure.in: Add a new option --enable-docbook-docs
+
+	* doc/Makefile.am: Add spec to SUBDIRS
+
+	* doc/api/Doxyfile.in: New file
+
+	* doc/api/Makefile.am: New file
+
+	* Doxyfile: Removed
+
+	* Doxyfile.in: Removed
+
+	* doc/spec/Makefile.am: New file
+
+	* doc/spec/hal-arch.dia: New file
+
+	* doc/spec/hal-arch.png: New file
+
+	* doc/spec/hal-devices-virtual1.png: New file
+
+	* doc/spec/hal-devices1.png: New file
+
+	* doc/spec/hal-fdi-example1.png: New file
+
+	* doc/spec/hal-sequence-diagram.dia: New file
+
+	* doc/spec/hal-sequence-diagram.png: New file
+
+	* doc/spec/hal-spec.html: New file
+
+	* doc/spec/hal-spec.xml.in: New file
+
+	* doc/spec/hal-volume-to-device.png: New file
+
 2004-07-21  Joe Shaw  <joeshaw at novell.com>
 
 	* hald/linux/bus_device.c (bus_device_move_from_tdl_to_gdl): If

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	29 Dec 2003 17:28:25 -0000	1.5
+++ Makefile.am	21 Jul 2004 23:07:45 -0000	1.6
@@ -13,7 +13,5 @@
 
 EXTRA_DIST = hal.pc.in hal.conf.in
 
-all-local: Doxyfile
-
 clean-local :
 	rm -f *~

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- configure.in	15 Jul 2004 21:58:32 -0000	1.26
+++ configure.in	21 Jul 2004 23:07:45 -0000	1.27
@@ -56,6 +56,7 @@
 AC_ARG_ENABLE(ansi,             [  --enable-ansi         enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
 AC_ARG_ENABLE(verbose-mode,     [  --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
 AC_ARG_ENABLE(doxygen-docs,     [  --enable-doxygen-docs     build DOXYGEN documentation (requires Doxygen)],enable_doxygen_docs=$enableval,enable_doxygen_docs=auto)
+AC_ARG_ENABLE(docbook-docs,     [  --enable-docbook-docs     build DocBook documentation (requires docbook2html)],enable_docbook_docs=$enableval,enable_docbook_docs=auto)
 
 if test x$enable_verbose_mode = xyes; then
     AC_DEFINE(ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
@@ -195,10 +196,43 @@
     fi
 fi
 
-AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
+AM_CONDITIONAL(DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
 AC_MSG_RESULT(yes)
 
 
+# DocBook Documentation
+
+AC_PATH_PROG(DOCBOOK, docbook2html, no)
+
+AC_MSG_CHECKING([whether to build DocBook documentation])
+
+if test x$DOCBOOK = xno ; then
+    have_docbook=no
+else
+    have_docbook=yes
+fi
+
+if test x$enable_docbook_docs = xauto ; then
+    if test x$have_docbook = xno ; then
+        enable_docbook_docs=no
+    else
+        enable_docbook_docs=yes
+    fi
+fi
+
+if test x$enable_docbook_docs = xyes; then
+    if test x$have_docbook = xno; then
+	AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found])
+    fi
+fi
+
+AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes)
+AC_MSG_RESULT(yes)
+
+
+
+
+
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
@@ -268,7 +302,6 @@
 AC_OUTPUT([
 hal.pc
 hal.conf
-Doxyfile
 Makefile
 hald/Makefile
 hald/haldaemon
@@ -281,6 +314,10 @@
 fdi/10generic/Makefile
 fdi/20freedesktop/Makefile
 doc/Makefile
+doc/api/Makefile
+doc/api/Doxyfile
+doc/spec/Makefile
+doc/spec/hal-spec.xml
 examples/Makefile
 examples/volumed/Makefile
 ])
@@ -304,6 +341,7 @@
         cflags:                   ${CFLAGS}
         cppflags:                 ${CPPFLAGS}
         Doxygen:                  ${DOXYGEN}
+        DocBook:                  ${DOCBOOK}
         User for HAL:             ${HAL_USER}
         Group for HAL:            ${HAL_GROUP}
         hald pidfile:             ${HALD_PID_FILE}
@@ -313,6 +351,7 @@
         Maintainer mode:          ${USE_MAINTAINER_MODE}
         Building verbose mode:    ${enable_verbose_mode}
         Building Doxygen docs:    ${enable_doxygen_docs}
+        Building docs:            ${enable_docbook_docs}
 "
 
 if test x$enable_verbose_mode = xyes; then