hal: Branch 'master'

[David Zeuthen]

 configure.in         |    4 ++++
 doc/Makefile.am      |    4 ++++
 doc/api/.gitignore   |   13 -------------
 doc/api/Makefile.am  |   48 +++++-------------------------------------------
 doc/api/hal-docs.xml |   19 -------------------
 fdi/fdi.dtd          |    1 +
 6 files changed, 14 insertions(+), 75 deletions(-)

New commits:
diff-tree b31483c694da396c42944bec24f37182488a9bb7 (from 66871d2a413f447ef8d89a763a0362ce38383801)
Author: William Jon McCann <mccann at jhu.edu>
Date:   Mon Mar 12 15:32:43 2007 -0400

    fix api docs even more
    
    Here's a patch to fix up some gtk-doc issues.
     * It installs separate manuals for each of the libraries
     * Adds GLIB_CFLAGS/LIBS so it builds
     * Avoids scanning the hald directory (by using separate manuals)
     * Adds some licence info to the manuals
     * Adds an index to each manual
     * Fixes up maintainer-clean

diff --git a/configure.in b/configure.in
index 32dbdca..11e0a0d 100644
--- a/configure.in
+++ b/configure.in
@@ -827,6 +827,10 @@ fdi/policy/20thirdparty/Makefile
 fdi/policy/30user/Makefile
 doc/Makefile
 doc/api/Makefile
+doc/api/libhal/Makefile
+doc/api/libhal/version.xml
+doc/api/libhal-storage/Makefile
+doc/api/libhal-storage/version.xml
 doc/conf/Makefile
 doc/spec/Makefile
 doc/spec/hal-spec.xml
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1352eae..a72f0ba 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,5 +3,9 @@ EXTRA_DIST = TODO
 
 SUBDIRS = api spec conf
 
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
+
 clean-local:
 	rm -f *~
diff --git a/doc/api/.gitignore b/doc/api/.gitignore
index cc347ad..23c1897 100644
--- a/doc/api/.gitignore
+++ b/doc/api/.gitignore
@@ -1,16 +1,3 @@
 Makefile
 Makefile.in
-Doxyfile
-html
-xml
-hal.hierarchy
-hal.interfaces
-hal.prerequisites
-hal.signals
-*.txt
-*.bak
-*.args
-*.stamp
-*.o
-tmpl
 *~
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 63c4ad8..9f79d66 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -1,46 +1,8 @@
-
 ## Process this file with automake to create Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.7
-
-# The name of the module.
-DOC_MODULE=hal
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=hal-docs.xml
-
-# Extra options to supply to gtkdoc-scan
-#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../..
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/libhal/*.h $(top_srcdir)/libhal-storage/*.h
-CFILE_GLOB=$(top_srcdir)/libhal/*.c $(top_srcdir)/libhal-storage/*.c
-
-# Headers to ignore
-IGNORE_HFILES=
-
-# CFLAGS and LDFLAGS for compiling scan program. Only needed
-# if $(DOC_MODULE).types is non-empty.
-INCLUDES =
-GTKDOC_LIBS =
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-MKTMPL_OPTIONS=
-
-# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
-content_files =
-
-# Images to copy into HTML directory
-HTML_IMAGES =
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
-
-include $(top_srcdir)/gtk-doc.make
+SUBDIRS = libhal libhal-storage
 
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in		\
+	$(NULL)
diff --git a/doc/api/hal-docs.xml b/doc/api/hal-docs.xml
deleted file mode 100644
index 95c2fe6..0000000
--- a/doc/api/hal-docs.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>HAL Reference Manual</title>
-  </bookinfo>
-
-  <chapter>
-    <title>Client library</title>
-    <xi:include href="xml/libhal.xml"/>
-  </chapter>
-
-  <chapter>
-    <title>Storage devices and volumes</title>
-    <xi:include href="xml/libhal-storage.xml"/>
-  </chapter>
-
-</book>
diff --git a/fdi/fdi.dtd b/fdi/fdi.dtd
index 341f61a..1cf19e4 100644
--- a/fdi/fdi.dtd
+++ b/fdi/fdi.dtd
@@ -29,6 +29,7 @@
     compare_gt       CDATA #IMPLIED
     compare_ge       CDATA #IMPLIED
     compare_ne       CDATA #IMPLIED
+    sibling_contains CDATA #IMPLIED
 >
 
 <!ELEMENT merge (#PCDATA) >