docbook: Update and add missing docbook Makefiles

This change updates all the Makefiles used to process docbook documents
so that they work with the new docbook build system. It also adds some
missing Makefiles. Every directory containing docbook documentation
should have a Makefile so that it can be processed independently.

doc/Makefile

@@ -1,31 +0,0 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = doc_root
-
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=..
-
-OUTPUT_DIR=xhtml
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-#VALIDATE=1
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.chunked.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc

doc/doc_root.xml

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" 
-   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<book id="ser_doc" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <bookinfo>
-	<revhistory>
-	    <revision>
-		<revnumber>$Revision$</revnumber>
-		<date>$Date$</date>
-	    </revision>
-	</revhistory>
-    </bookinfo>
-
-    <chapter>
-        <?dbhtml dir="sip_intro"?>
-	<title>SIP Introduction</title>
-	<xi:include href="sip/sip_introduction.xml"/>
-    </chapter>
-
-    <chapter>
-        <?dbhtml dir="ser_howto"?>
-	<title>Howto</title>
-	<xi:include href="serhowto/ser-howto.xml"/>
-    </chapter>
-
-    <chapter>
-        <?dbhtml dir="radius_howto"?>
-	<title>RADIUS Howto</title>
-	<xi:include href="ser_radius/ser_radius.xml"/>
-    </chapter>
-
-    <chapter>
-        <?dbhtml dir="admin_guide"?>
-	<title>Administrator's Guide</title>
-	<xi:include href="seruser/seruser.xml"/>
-    </chapter>
-
-    <chapter>
-        <?dbhtml dir="xmlrpc"?>
-	<title>SER Remote Procedure Call Interface</title>
-	<xi:include href="rpc/ser_rpc.xml"/>
-    </chapter>
-
-    <chapter>
-        <?dbhtml dir="db_schema"?>
-	<title>SER Database Schema and Administration</title>
-	<xi:include href="database/ser_db.xml"/>
-    </chapter>
-
-    <chapter>
-        <?dbhtml dir="presence"?>
-	<title>Presence Handbook</title>
-	<xi:include href="presence/intro.xml"/>
-	<xi:include href="presence/xcap.xml"/>
-	<xi:include href="presence/install.xml"/>
-	<xi:include href="presence/examples.xml"/>
-	<xi:include href="presence/biblio.xml"/>
-    </chapter>
-	
-    <chapter>
-        <?dbhtml dir="modules"?>
-    	<title>Module Documentation</title>
-<!--	<xi:include href="../modules/acc/doc/acc.xml"/> -->
-	<xi:include href="../modules/auth/doc/auth.xml"/>
-	<xi:include href="../modules/auth_db/doc/auth_db.xml"/>
-	<xi:include href="../modules/auth_radius/doc/auth_radius.xml"/>
-	<xi:include href="../modules/avp/doc/avp.xml"/>
-	<xi:include href="../modules/avp_db/doc/avp_db.xml"/>
-	<xi:include href="../modules/avpops/doc/avpops.xml"/>
-	<xi:include href="../modules/avp_radius/doc/avp_radius.xml"/>
-	<xi:include href="../modules/cpl-c/doc/cpl-c.xml"/>
-	<xi:include href="../modules/dbtext/doc/dbtext.xml"/>
-	<xi:include href="../modules/dispatcher/doc/dispatcher.xml"/>
-	<xi:include href="../modules/diversion/doc/diversion.xml"/>
-	<xi:include href="../modules/domain/doc/domain.xml"/>
-	<xi:include href="../modules/enum/doc/enum.xml"/>
-	<xi:include href="../modules/exec/doc/exec.xml"/>
-	<xi:include href="../modules/flatstore/doc/flatstore.xml"/>
-	<xi:include href="../modules/gflags/doc/gflags.xml"/>
-	<xi:include href="../modules/group/doc/group.xml"/>
-	<xi:include href="../modules/group_radius/doc/group_radius.xml"/>
-	<xi:include href="../modules/jabber/doc/jabber.xml"/>
-	<xi:include href="../modules/mangler/doc/mangler.xml"/>
-	<xi:include href="../modules/maxfwd/doc/maxfwd.xml"/>
-	<xi:include href="../modules/msilo/doc/msilo.xml"/>
-	<xi:include href="../modules/nathelper/doc/nathelper.xml"/>
-	<xi:include href="../modules/options/doc/options.xml"/>
-	<xi:include href="../modules/pa/doc/pa.xml"/>
-	<xi:include href="../modules/pdt/doc/pdt.xml"/>
-	<xi:include href="../modules/permissions/doc/permissions.xml"/>
-	<xi:include href="../modules/pike/doc/pike.xml"/>
-	<xi:include href="../modules/print/doc/print.xml"/>
-	<xi:include href="../modules/registrar/doc/registrar.xml"/>
-	<xi:include href="../modules/rls/doc/rls.xml"/>
-	<xi:include href="../modules/rr/doc/rr.xml"/>
-	<xi:include href="../modules/sl/doc/sl.xml"/>
-	<xi:include href="../modules/sms/doc/sms.xml"/>
-	<xi:include href="../modules/speeddial/doc/speeddial.xml"/>
-	<xi:include href="../modules/textops/doc/textops.xml"/>
-	<xi:include href="../modules/tm/doc/tm.xml"/>
-	<xi:include href="../modules/uac/doc/uac.xml"/>
-	<xi:include href="../modules/uri/doc/uri.xml"/>
-	<xi:include href="../modules/uri_db/doc/uri_db.xml"/>
-	<xi:include href="../modules/uri_radius/doc/uri_radius.xml"/>
-	<xi:include href="../modules/usrloc/doc/usrloc.xml"/>
-	<xi:include href="../modules/xlog/doc/xlog.xml"/>
-    </chapter>
-   
-    <chapter>
-        <?dbhtml dir="devel"?>
-	<title>Developer's Guide</title>
-	<xi:include href="serdev/serdev.xml"/>
-    </chapter>
-    <chapter>
-        <?dbhtml dir="faq"?>
-	<title>Frequently Asked Questions</title>
-	<xi:include href="serfaq/serfaq.xml"/>
-    </chapter>
-</book>

doc/presence/Makefile

@@ -1,29 +1,4 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = presence_book
+docs = presence_book.xml
 
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=../..
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-#VALIDATE=1
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

doc/rpc/Makefile

@@ -1,7 +1,3 @@
-#
-# The list of documents to build (without extensions)
-#
-
 docs = ser_rpc.xml
 docbook_dir = ../../docbook
 

doc/ser_radius/Makefile

@@ -1,29 +1,4 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = ser_radius
+docs = ser_radius.xml
 
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=../..
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-VALIDATE=0
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

doc/serdev/Makefile

@@ -1,29 +1,4 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = serdev
+docs = serdev.xml
 
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=../..
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-#VALIDATE=1
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

doc/serfaq/Makefile

@@ -1,29 +1,4 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = serfaq
+docs = serfaq.xml
 
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=../..
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-#VALIDATE=1
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

doc/serhowto/Makefile

@@ -1,29 +1,4 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = ser-howto
+docs = ser-howto.xml
 
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=../..
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-#VALIDATE=1
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

doc/seruser/Makefile

@@ -1,29 +1,4 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = seruser
+docs = seruser.xml
 
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=../..
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-#VALIDATE=1
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

doc/sip/Makefile

@@ -1,29 +1,4 @@
-#
-# The list of documents to build (without extensions)
-#
-DOCUMENTS = sip_introduction
+docs = sip_introduction.xml
 
-#
-# The root directory containing Makefile.doc
-#
-ROOT_DIR=../..
-
-#
-# Validate docbook documents before generating output
-# (may be slow)
-#
-#VALIDATE=1
-
-#
-# You can override the stylesheet used to generate
-# xhtml documents here
-#
-#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl
-
-#
-# You can override the stylesheet used to generate
-# plain text documents here
-#
-#TXT_XSL=$(XHTML_XSL)
-
-include $(ROOT_DIR)/Makefile.doc
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

lib/cds/doc/Makefile

@@ -0,0 +1,4 @@
+docs = cds.xml
+
+docbook_dir = ../../../docbook
+include $(docbook_dir)/Makefile

lib/doc/Makefile

@@ -0,0 +1,4 @@
+docs = collection.xml
+
+docbook_dir = ../../docbook
+include $(docbook_dir)/Makefile

lib/presence/doc/Makefile

@@ -0,0 +1,4 @@
+docs = presence.xml
+
+docbook_dir = ../../../docbook
+include $(docbook_dir)/Makefile

lib/xcap/doc/Makefile

@@ -0,0 +1,4 @@
+docs = xcap.xml
+
+docbook_dir = ../../../docbook
+include $(docbook_dir)/Makefile