Cleanup of gnome-doc-utils stuff

6 files changed, 0 insertions, 1773 deletions

diff --git a/tools/gnome-doc-prepare.in b/tools/gnome-doc-prepare.in
deleted file mode 100644
index 0777178..0000000
--- a/tools/gnome-doc-prepare.in
+++ /dev/null
@@ -1,350 +0,0 @@
-#! /bin/sh
-# gnome-doc-prepare - Prepare a package to use gnome-doc-utils.
-# @configure_input@
-# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-# Copyright (C) 2001 Eazel, Inc.
-# Copyright (C) 2004 Danilo Segan <danilo@gnome.org>.
-#
-# Originally based on libtoolize by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# Modified for xml-i18n-tools by Maciej Stachowiak <mjs@noisehavoc.org>
-#
-# Modified for gnome-doc-utils by Danilo Šegan <danilo@gnome.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# The name of this program.
-progname=`echo "$0" | sed 's%^.*/%%'`
-
-# Constants.
-PROGRAM=gnome-doc-prepare
-PACKAGE=@PACKAGE@
-VERSION=@VERSION@
-
-# Directory names.
-prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-pkgdatadir=@datadir@/gnome-doc-utils
-
-# FIXME: I want this through pkg-config
-gdu_m4="${datadir}/aclocal/gnome-doc-utils.m4"
-gdu_make="${pkgdatadir}/gnome-doc-utils.make"
-omf_template="${pkgdatadir}/template.omf.in"
-xml_template="${pkgdatadir}/template-document.xml"
-makefile_template="${pkgdatadir}/template.make"
-
-dry_run=no
-help="Try '$progname --help' for more information."
-rm="rm -f"
-rm_rec="rm -rf"
-ln_s="ln -s"
-cp="cp -f"
-mkdir="mkdir"
-sed="sed"
-mkinstalldirs="mkinstalldirs"
-
-# Global variables.
-automake=
-copy=
-force=
-status=0
-
-for arg
-do
-  case "$arg" in
-  --help)
-    cat <<EOF
-Usage: $progname [OPTION]...
-
-Prepare a package to use gnome-doc-utils.
-
-    --automake        work silently, and assume that Automake is in use
--c, --copy            copy files rather than symlinking them
-    --new-document DOCUMENT
-                      initialize help/DOCUMENT/*
-    --debug           enable verbose shell tracing
--n, --dry-run         print commands rather than running them
--f, --force           replace existing files
-    --help            display this message and exit
-    --version         print version information and exit
-
-You must 'cd' to the top directory of your package before you run
-'$progname'.
-EOF
-    exit 0
-    ;;
-
-  --version)
-    echo "$PROGRAM (GNU $PACKAGE) $VERSION"
-    exit 0
-    ;;
-
-  --automake)
-    automake=yes
-    ;;
-
-  --new-document)
-    shift
-    docname=yes
-    ;;
-
-  -c | --copy)
-    ln_s=
-    ;;
-
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  -n | --dry-run)
-    if test "$dry_run" != yes; then
-      dry_run=yes
-      rm="echo $rm"
-      rm_rec="echo $rm_rec"
-      test -n "$ln_s" && ln_s="echo $ln_s"
-      cp="echo $cp"
-      mkdir="echo mkdir"
-      mkinstalldirs="echo $mkinstalldirs"
-      sed="echo $sed"
-    fi
-    ;;
-
-  -f | --force)
-    force=yes
-    ;;
-
-  -*)
-    echo "$progname: unrecognized option '$arg'" 1>&2
-    echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    if [ "x$docname" = "xyes" ]
-    then
-      newdocument="$arg" 
-      docname=no
-    else
-      echo "$progname: too many arguments" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi
-    ;;
-  esac
-done
-
-if test -f configure.ac; then
-    configure="configure.ac"
-else
-    if test -f configure.in; then
-	configure="configure.in"
-    else
-	echo "$progname: neither 'configure.ac' nor 'configure.in' exists" 1>&2
-	echo "$help" 1>&2
-	exit 1
-    fi
-fi
-
-
-files='gnome-doc-utils.make'
-
-auxdir=.
-auxdirline=`egrep '^AC_CONFIG_AUX_DIR' $configure 2>/dev/null`
-if test -n "$auxdirline"; then
-  # Handle explicit AC_CONFIG_AUX_DIR settings.
-  auxdir=`echo "$auxdirline" | sed 's/^AC_CONFIG_AUX_DIR(\([^)]*\)).*$/\1/'`
-
-  if test "$auxdir" = "$auxdirline"; then
-    echo "$progname: invalid AC_CONFIG_AUX_DIR syntax: $auxdirline" 1>&2
-    exit 1
-  else
-    # Strip any quote brackets.
-    auxdir=`echo "$auxdir" | sed 's/^\[\(.*\)\]$/\1/g'`
-    case "$auxdir" in
-    *\$*)
-      echo "$progname: cannot handle variables in AC_CONFIG_AUX_DIR" 1>&2
-      exit 1
-      ;;
-    *)
-    ;;
-    esac
-  fi
-else
-  # Try to discover auxdir the same way it is discovered by configure.
-  # Note that we default to the current directory.
-  for dir in . .. ../..; do
-    if test -f $dir/install-sh; then
-      auxdir=$dir
-      break
-    elif test -f $dir/install.sh; then
-      auxdir=$dir
-      break
-    fi
-  done
-fi
-
-if test -z "$automake"; then
-  if egrep '^GNOME_DOC_INIT' $configure >/dev/null 2>&1; then :
-  else
-    echo "Remember to add 'GNOME_DOC_INIT' to $configure."
-  fi
-
-  if grep 'generated automatically by aclocal' aclocal.m4 >/dev/null 2>&1; then
-    updatemsg="update your 'aclocal.m4' by running aclocal"
-  else
-    updatemsg="add the contents of '$gdu_m4' to 'aclocal.m4'"
-  fi
-
-  if egrep '^AC_DEFUN\(GNOME_DOC_INIT' aclocal.m4 >/dev/null 2>&1; then
-    # Check the version number on gnome-doc-utils.m4 and the one used in aclocal.m4.
-    instserial=`grep '^# serial ' $gdu_m4 | grep 'GNOME_DOC_INIT' | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
-
-    if test -z "$instserial"; then
-      echo "$progname: warning: no serial number on '$gdu_m4'" 1>&2
-    else
-      # If the local macro has no serial number, we assume it's ancient.
-      localserial=`grep '^# serial ' aclocal.m4 | grep 'GNOME_DOC_INIT' | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
-
-      test -z "$localserial" && localserial=0
-
-      if test "$localserial" -lt "$instserial"; then
-	echo "You should $updatemsg."
-      elif test "$localserial" -gt "$instserial"; then
-	echo "$progname: '$gdu_m4' is serial $instserial, less than $localserial in 'aclocal.m4'" 1>&2
-	if test -z "$force"; then
-	  echo "Use '--force' to replace newer gnome-doc-utils files with this version." 1>&2
-	  exit 1
-	fi
-	echo "To remain compatible, you should $updatemsg."
-      fi
-    fi
-  else
-    echo "You should $updatemsg."
-  fi
-fi
-
-
-
-# Change to the auxiliary directory.
-(
-cur=`pwd`
-if test "$auxdir" != .; then
-  test -z "$automake" && echo "Putting files in AC_CONFIG_AUX_DIR, '$auxdir'."
-  cd $auxdir || exit 1
-fi
-
-for file in $files; do
-  if test -f "$file" && test -z "$force"; then
-    test -z "$automake" && echo "$progname: '$file' exists: use '--force' to overwrite" 1>&2
-    continue
-  fi
-
-  $rm $file
-  if test -n "$ln_s" && $ln_s $pkgdatadir/`basename $file` $file; then :
-  elif $cp $pkgdatadir/`basename $file` $file; then :
-  else
-    echo "$progname: cannot copy '$pkgdatadir/`basename $file`' to '$file'" 1>&2
-    status=1
-  fi
-done
-
-exit $status
-# make sure this subshell exits with the exit value if it failed
-) || exit $?
-
-# Adapted from gtkdocize:
-# If the AC_CONFIG_MACRO_DIR() macro is used, copy gnome-doc-utils.m4 
-# from our prefix to that directory.  This makes sure that the M4 macro
-# used matches the automake fragment.
-# If AC_CONFIG_MACRO_DIR is not used, the macro won't be copied, and
-# the correct flags must be passed to aclocal for it to find the macro.
-m4dir=`cat "$configure" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-
-if test -n "$m4dir"; then
-(
-cur=`pwd`
-if test "$m4dir" != .; then
-  test -z "$automake" && echo "Putting files in AC_CONFIG_MACRO_DIR, '$m4dir'."
-  cd $m4dir || exit 1
-fi
-
-files='gnome-doc-utils.m4'
-
-for file in $files; do
-  if test -f "$file" && test -z "$force"; then
-    test -z "$automake" && echo "$progname: '$file' exists: use '--force' to overwrite" 1>&2
-    continue
-  fi
-
-  $rm $file
-  if test -n "$ln_s" && $ln_s $datadir/aclocal/$file $file; then :
-  elif $cp $datadir/aclocal/$file $file; then :
-  else
-    echo "$progname: cannot copy '$datadir/aclocal/$file' to '$file'" 1>&2
-    status=1
-  fi
-done
-
-exit $status
-# make sure this subshell exits with the exit value if it failed
-) || exit $?
-fi
-
-
-# FIXME: This probably does not work w/ builddir != srcdir because it
-# gets at source files relative to the current directory.
-
-
-if [ "x$newdocument" != "x" ]
-then
-    MYDATE="`date -I`"
-    MYYEAR="`date +%Y`"
-    MYUSERNAME="`whoami`"
-    MYDOMAIN="`hostname -d`"
-    MYSERIESID="`scrollkeeper-gen-seriesid`"
-    MYDOCUMENT="$newdocument"
-
-    ( # FIXME: check if any of these already exist, and overwrite only if $force
-    mkdir -p "help/$newdocument/C" && \
-	sed \
-	-e 's/@DATE@/$MYDATE/g' \
-	-e 's/@YEAR@/$MYYEAR/g' \
-	-e 's/@USERNAME@/$MYUSERNAME/g' \
-	-e 's/@DOMAIN@/$MYDOMAIN/g' \
-	-e 's/@DOCUMENT@/$MYDOCUMENT/g' \
-	< $xml_template > "help/$newdocument/C/$newdocument.xml" && \
-	$sed \
-	-e 's/@DATE@/$MYDATE/g' \
-	-e 's/@SERIESID@/$MYSERIESID/g' \
-	< $omf_template > "help/$newdocument/$newdocument.omf.in" && \
-	sed \
-	-e 's/@DOCUMENT@/$MYDOCUMENT/g' \
-	< $makefile_template > "help/$newdocument/Makefile.am"
-    )
-fi
-
-exit $status
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/tools/gnome-doc-tool.in b/tools/gnome-doc-tool.in
deleted file mode 100644
index dfdf6b0..0000000
--- a/tools/gnome-doc-tool.in
+++ /dev/null
@@ -1,687 +0,0 @@
-#!/bin/sh
-# gnome-doc-html - Convert documentation to HTML
-# gnome-doc-html.  Generated from gnome-doc-html.in by configure.
-# Copyright (C) 2006 Shaun McCance <shaunm@gnome.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-progname=`echo "$0" | sed 's%^.*/%%'`
-
-PROGRAM=gnome-doc-html
-PACKAGE=@PACKAGE@
-VERSION=@VERSION@
-prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-pkgdatadir=@datadir@/gnome-doc-utils
-xsltdir=@datadir@/xml/gnome/xslt
-
-# This is important to make sure string manipulation is handled
-# byte-by-byte.
-export LANG=C
-
-XSL_ICONS='
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:mal="http://projectmallard.org/1.0/"
-  version="1.0">
-<xsl:import href="'$xsltdir'/gettext/gettext.xsl"/>
-<xsl:output method="text" encoding="utf-8"/>
-<xsl:template match="*">
-  <xsl:apply-templates/>
-</xsl:template>
-<xsl:template match="text()"/>
-<xsl:template match="caution">
-  <xsl:text>admon-caution&#x000A;</xsl:text>
-</xsl:template>
-<xsl:template match="important">
-  <xsl:text>admon-important&#x000A;</xsl:text>
-</xsl:template>
-<xsl:template match="note">
-  <xsl:choose>
-    <xsl:when test="@role='\''bug'\''">
-      <xsl:text>admon-bug&#x000A;</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>admon-note&#x000A;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template match="tip">
-  <xsl:text>admon-tip&#x000A;</xsl:text>
-</xsl:template>
-<xsl:template match="warning">
-  <xsl:text>admon-warning&#x000A;</xsl:text>
-</xsl:template>
-<xsl:template match="mal:note">
-  <xsl:choose>
-    <xsl:when test="contains(concat('\'' '\'', @style, '\'' '\''), '\''advanced'\'')">
-      <xsl:text>admon-important&#x000A;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains(concat('\'' '\'', @style, '\'' '\''), '\''bug'\'')">
-      <xsl:text>admon-bug&#x000A;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains(concat('\'' '\'', @style, '\'' '\''), '\''important'\'')">
-      <xsl:text>admon-important&#x000A;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains(concat('\'' '\'', @style, '\'' '\''), '\''tip'\'')">
-      <xsl:text>admon-tip&#x000A;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains(concat('\'' '\'', @style, '\'' '\''), '\''warning'\'')">
-      <xsl:text>admon-warning&#x000A;</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>admon-note&#x000A;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template match="/FALSE">
-  <xsl:if test="//blockquote[1]">
-    <xsl:call-template name="l10n.gettext">
-      <xsl:with-param name="msgid" select="'\''blockquote-watermark-201C'\''"/>
-    </xsl:call-template>
-    <xsl:text>&#x000A;</xsl:text>
-  </xsl:if>
-  <xsl:if test="//classsynopsis[@language = '"'"'cpp'"'"'][1] or //programlisting[@language = '"'"'cpp'"'"']">
-    <xsl:text>watermark-code-cpp&#x000A;</xsl:text>
-  </xsl:if>
-  <xsl:if test="//classsynopsis[@language = '"'"'python'"'"'][1] or //programlisting[@language = '"'"'python'"'"']">
-    <xsl:text>watermark-code-python&#x000A;</xsl:text>
-  </xsl:if>
-</xsl:template>
-</xsl:stylesheet>'
-
-XSL_CACHE_LS='
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:cache="http://projectmallard.org/cache/1.0/"
-  xmlns:mal="http://projectmallard.org/1.0/"
-  version="1.0">
-<xsl:output method="text"/>
-<xsl:template match="/">
-  <xsl:for-each select="cache:cache/mal:page">
-    <xsl:value-of select="@cache:href"/>
-    <xsl:text>&#x000A;</xsl:text>
-  </xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>'
-
-XSL_DOCBOOK_MEDIA='
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="1.0">
-<xsl:output method="text" encoding="utf-8"/>
-<xsl:template match="/">
-  <xsl:for-each select="//audiodata|//imagedata|//videodata">
-    <xsl:choose>
-      <xsl:when test="@fileref">
-        <xsl:value-of select="@fileref"/>
-      </xsl:when>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-    </xsl:choose>
-    <xsl:text>&#x000A;</xsl:text>
-  </xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>'
-
-XSL_MALLARD_CSS='
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:mal="http://projectmallard.org/1.0/"
-  version="1.0">
-<xsl:import href="'$xsltdir'/gettext/gettext.xsl"/>
-<xsl:import href="'$xsltdir'/common/theme.xsl"/>
-<xsl:import href="'$xsltdir'/mallard/html/mal2html-css.xsl"/>
-<xsl:output method="text"/>
-<xsl:template match="/">
-<xsl:call-template name="mal2html.css.content"/>
-</xsl:template>
-</xsl:stylesheet>'
-
-XSL_MALLARD_MEDIA='
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:mal="http://projectmallard.org/1.0/"
-  version="1.0">
-<xsl:output method="text" encoding="utf-8"/>
-<xsl:template match="/">
-  <xsl:for-each select="//mal:media">
-    <xsl:value-of select="@src"/>
-    <xsl:text>&#x000A;</xsl:text>
-  </xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>'
-
-error() {
-    echo "$progname: $1" 1>&2;
-    exit 1;
-}
-
-print_help() {
-    cat <<EOF
-Usage: $progname <COMMAND> [OPTIONS] FILES...
-Process a documentation file.
-
-COMMAND is one of:
-  list-icons   list automatic icons and watermarks
-  list-media   list all referenced media files
-  html         convert the documents to HTML
-  xhtml        convert the documents to XHTML
-  css          create a CSS file for a Mallard document
-  help         display this help and exit
-EOF
-}
-
-print_help_css() {
-cat <<EOF
-Usage $progname css [OPTIONS] [FILE]
-Create a CSS file for a Mallard document.
-If FILE is not supplied, uses index.page as input.
-
-CSS Options:
-  -o, --output=PATH               the file to output to
-
-Miscellaneous:
-  -v, --verbose                   print all the commands executed
-  -V, --version                   print version information and exit
-  -h, --help                      display this help and exit
-EOF
-}
-
-print_help_html() {
-    format="$1"
-    upformat=`echo $format | tr a-z A-Z`
-    cat <<EOF
-Usage: $progname $format [OPTIONS] FILE
-Convert FILE into $upformat.
-
-Basic Output Control:
-  -c, --css-file=FILE             file to output CSS to
-  -e, --extension=EXT             the extension to append to output files
-  -n, --no-figures                do not copy figures into the output directory
-  -o, --output=PATH               the file or directory to output to
-  -x, --custom-xslt=PATH          custom XSLT to include in the transform
-                                  (currently only for Mallard)
-
-Automatic Graphics:
-  --copy-graphics                 copy graphics into the output directory
-  --admon-graphics-path=PATH      the path to the admonition graphics
-  --admon-graphics-size=INT       the size of the admonition graphics
-
-Docbook Chunking:
-  -d, --chunk-depth=INT           how deep sections should be chunked
-
-DocBook Styling:
-  --classsynopsis-language=LANG   the default programming language to be used
-                                  for classsynopsis elements
-  --funcsynopsis-style=STYLE      the style to be used to render funcsynopsis
-                                  elements, either 'KR' or 'ANSI'
-
-Miscellaneous:
-  -v, --verbose                   print all the commands executed
-  -V, --version                   print version information and exit
-  -h, --help                      display this help and exit
-EOF
-}
-
-echo_verbose() {
-    if [ "x$doc_verbose" = "x1" ]; then echo $1; fi
-}
-
-mkdir_p() {
-    __dir__='';
-    echo $1 | sed -e 's/\//\n/g' | while read d; do
-	__dir__="$__dir__$d/"
-	if [ ! -d "$__dir__" ]; then
-	    echo_verbose "mkdir \"$__dir__\""
-	    mkdir "$__dir__" || error "Could not create directory"
-	fi
-    done || exit 1;
-}
-
-urlencode() {
-    arg="$1"
-    i="0"
-    while [ "$i" -lt ${#arg} ]; do
-	c=${arg:$i:1}
-	if echo "$c" | grep -q '[a-zA-Z/:_\.\-]'; then
-	    echo -n "$c"
-	else
-	    echo -n "%"
-	    printf "%X" "'$c'"
-	fi
-	i=$((i+1))
-    done
-}
-
-urldecode() {
-    arg="$1"
-    i="0"
-    while [ "$i" -lt ${#arg} ]; do
-	c0=${arg:$i:1}
-	if [ "x$c0" = "x%" ]; then
-	    c1=${arg:$((i+1)):1}
-	    c2=${arg:$((i+2)):1}
-	    printf "\x$c1$c2"
-	    i=$((i+3))
-	else
-	    echo -n "$c0"
-	    i=$((i+1))
-	fi
-    done
-}
-
-copy_icons() {
-    if [ "x$doc_copy_icons" = "x1" ]; then
-	if [ "x$doc_icons_admon_path" = "x" ]; then
-	    p="$pkgdatadir/icons/hicolor/"
-	    if [ "x$doc_icons_admon_size" != "x" ]; then
-		doc_icons_admon_path="${p}${doc_icons_admon_size}x${doc_icons_admon_size}/status"
-	    else
-		doc_icons_admon_path="${p}48x48/status"
-	    fi
-	    unset p
-	fi
-	for doc_icon in $(echo $doc_icons_to_copy | tr ' ' '\n' | grep '^admon-' | sort | uniq); do
-	    doc_icon_file="${doc_icon}.png"
-	    cmd="cp \"$doc_icons_admon_path/$doc_icon_file\" \"$doc_outdir/$doc_icon_file\""
-	    echo_verbose "$cmd"
-	    eval "$cmd"
-	done
-    fi
-}
-
-list_icons() {
-    while [ "$#" != "0" ]; do
-	if [ -d "$1" ]; then
-	    list_icons "$1/"*.page
-	else
-	    echo "$XSL_ICONS" | xsltproc --nonet --xinclude - "$1"
-	fi
-	shift
-    done | sort | uniq
-}
-
-list_media() {
-    if [ "x$(echo "$1" | sed -e 's/.*\.//')" = "xpage" -o -d "$1" ]; then
-	XSL_MEDIA="$XSL_MALLARD_MEDIA"
-    else
-	XSL_MEDIA="$XSL_DOCBOOK_MEDIA"
-    fi
-    while [ "$#" != "0" ]; do
-	if [ -d "$1" ]; then
-	    list_media "$1/"*.page
-	else
-	    doc_indir=$(dirname "$1")
-	    if [ "$doc_indir" = "." ]; then
-		doc_indir=""
-	    else
-		doc_indir="$doc_indir/"
-	    fi
-	    echo "$XSL_MEDIA" | xsltproc --nonet --xinclude - "$1" \
-		| while read doc_media; do
-		echo "$doc_indir$doc_media"
-	    done
-	fi
-	shift
-    done | sort | uniq
-}
-
-convert_docbook2html() {
-    if [ "x$doc_extension" = "x" ]; then doc_extension=".$doc_format"; fi
-    if [ "x$doc_output" = "x" ]; then
-	doc_outdir=`pwd`
-    elif [ -d "$doc_output" -o $(echo "$doc_output" | sed -e 's/.*\/$/\//') = "/" ]; then
-	mkdir_p "$doc_output"
-	doc_outdir=`(cd "$doc_output" && pwd)`
-    else
-	if [ "$#" != "1" ]; then
-	    error "With multiple input files, output must be a directory"
-	fi
-	dir=`dirname "$doc_output"`
-	mkdir_p "$dir"
-	doc_outdir=`(cd "$dir" && pwd)`
-	doc_outfile=`basename "$doc_output"`
-	doc_outfile_q="1"
-	if [ "x$doc_extension" = "x" ]; then
-	    doc_extension=`echo "$doc_outfile" | grep -o '\..*'`
-	fi;
-    fi;
-    while [ "$#" != "0" ]; do
-	doc_input="$1"
-	shift
-
-	if [ ! -f "$doc_input" ]; then error "$doc_input: No such file"; fi
-	doc_indir=$( (cd $(dirname "$doc_input") && pwd) )
-	doc_infile=$(basename "$doc_input")
-	doc_inbase=$(basename "$doc_infile" ".xml")
-	if [ "$doc_inbase" = "$doc_infile" ]; then
-	    doc_inbase=$(basename "$doc_infile" ".docbook")
-	fi;
-
-	if [ "x$doc_outfile_q" != "x1" ]; then
-	    doc_outfile="${doc_inbase}${doc_extension}"
-	fi
-	doc_outbase=$(basename "$doc_outfile" "$doc_extension")
-
-	params='--param db.chunk.chunk_top 0'
-	params="$params --stringparam db.chunk.basename \"$doc_outbase\""
-	params="$params --stringparam db.chunk.extension \"$doc_extension\""
-	if [ "x$doc_chunk_depth" != "x" ]; then
-	    params="$params --param db.chunk.max_depth $doc_chunk_depth"
-	fi
-	if [ "x$doc_css_file" != "x" ]; then
-	    params="$params --stringparam db2html.css.file \"$doc_css_file\""
-	fi
-
-	if [ "x$doc_copy_icons" = "x1" ]; then
-	    doc_icons=$(list_icons "$doc_indir/$doc_infile")
-	    doc_icons_to_copy="$doc_icons $doc_icons_to_copy"
-	    for doc_icon in $(echo $doc_icons | tr ' ' '\n' | grep '^admon-' | sort | uniq); do
-		param="theme.icon."$(echo $doc_icon | sed -e 's/-/./');
-		params="$params --stringparam $param \"$doc_icon\""
-	    done
-	fi
-	if [ "x$doc_copy_icons" != "x1" -a "x$doc_icons_path" != "x" ]; then
-	    params="$params --stringparam theme.icon.admon.path \"$doc_icons_admon_path\""
-	fi
-	if [ "x$doc_admon_graphics_size" != "x" ]; then
-	    params="$params --stringparam theme.icon.admon.size \"$doc_icons_admon_size\""
-	fi
-	if [ "x$doc_classsynopsis_language" != "x" ]; then
-	    params="$params --stringparam db2html.classsynopsis.language"
-	    params="$params \"$doc_classsynopsis_language\""
-	fi
-	if [ "x$doc_funcsynopsis_style" != "x" ]; then
-	    params="$params --stringparam db2html.funcsynopsis.style"
-	    params="$params \"$doc_funcsynopsis_style\""
-	fi
-
-	cmd="xmllint --nonet --xinclude \"$doc_indir/$doc_infile\" |\
-          xsltproc $params -o \"$doc_outdir/$doc_outfile\" \"$xsltdir/docbook/html/db2$doc_format.xsl\" -"
-	echo_verbose "$cmd"
-	eval "$cmd"
-	exit 0
-
-	if [ "x$doc_no_figures" != "x1" -a "$doc_indir" != "$doc_outdir" ]; then
-	    echo "$XSL_DOCBOOK_MEDIA" \
-		| xsltproc --nonet --xinclude - "$doc_indir/$doc_infile" \
-		| while read doc_media; do
-		mkdir_p "$doc_outdir/"`dirname "$fig"`
-		cmd="cp \"$doc_indir/$fig\" \"$doc_outdir/$fig\""
-		echo_verbose "$cmd"
-		eval "$cmd"
-	    done
-	fi
-    done
-    copy_icons
-}
-
-convert_mallard2html() {
-    if [ "x$doc_extension" = "x" ]; then doc_extension=".$doc_format"; fi
-    if [ "x$doc_output" = "x" ]; then
-	doc_outdir=`pwd`
-    elif [ -d "$doc_output" -o $(echo "$doc_output" | sed -e 's/.*\/$/\//') = "/" ]; then
-	mkdir_p "$doc_output"
-	doc_outdir=`(cd "$doc_output" && pwd)`
-    else
-	if [ "$#" != "1" -o -d "$1" ]; then
-	    error "With multiple input files, output must be a directory"
-	fi
-	dir=`dirname "$doc_output"`
-	mkdir_p "$dir"
-	doc_outdir=`(cd "$dir" && pwd)`
-	doc_outfile=`basename "$doc_output"`
-	doc_outfile_q="1"
-	if [ "x$doc_extension" = "x" ]; then
-	    doc_extension=`echo "$doc_outfile" | grep -o '\..*'`
-	fi;
-    fi;
-    doc_cache_in="$doc_outdir/index.cache.in"
-    doc_cache="$doc_outdir/index.cache"
-    doc_tmpfiles="$doc_tmpfiles doc_cache_in doc_cache_out"
-    (
-	echo '<cache:cache xmlns:cache="http://projectmallard.org/cache/1.0/"'
-	echo '             xmlns="http://projectmallard.org/1.0/">'
-	while [ "$#" != "0" ]; do
-	    doc_input="$1"
-	    shift
-	    if [ -d "$doc_input" ]; then
-		doc_input_full=$(cd "$doc_input" && pwd)
-		for doc_input_file in "$doc_input_full/"*.page; do
-		    echo "$doc_input_file"
-		done
-		unset doc_input_full
-	    else
-		echo "$(pwd)/$doc_input"
-	    fi
-	done | while read doc_input; do
-	    doc_input_esc=$(urlencode "$doc_input" | sed -e 's/\&/\&amp;/g' -e 's/</\&lt;/g' -e "s/'/\&apos;/g")
-	    echo "<page cache:href='file://$doc_input_esc'/>"
-	done
-	echo '</cache:cache>'
-    ) > "$doc_cache_in"
-    xsltproc -o "$doc_cache" "$xsltdir/mallard/cache/mal-cache.xsl" "$doc_cache_in"
-    rm "$doc_cache_in"
-    echo "$XSL_CACHE_LS" | xsltproc - "$doc_cache" | while read doc_input; do
-	doc_input=$(urldecode $(echo "$doc_input" | sed -e 's/^file:\/\///'))
-	doc_indir=$( (cd $(dirname "$doc_input") && pwd) )
-	doc_infile=$(basename "$doc_input")
-	doc_inbase=$(basename "$doc_infile" ".page")
-
-	if [ "x$doc_outfile_q" != "x1" ]; then
-	    doc_outfile="${doc_inbase}${doc_extension}"
-	fi
-
-	params='--param mal.chunk.chunk_top 0'
-	params="$params --stringparam mal.cache.file \"$doc_cache\""
-
-	if [ "x$doc_css_file" != "x" ]; then
-	    params="$params --stringparam mal2html.css.file \"$doc_css_file\""
-	fi
-
-	if [ "x$doc_copy_icons" = "x1" ]; then
-	    doc_icons=$(list_icons "$doc_indir/$doc_infile")
-	    doc_icons_to_copy="$doc_icons $doc_icons_to_copy"
-	    for doc_icon in $(echo $doc_icons | tr ' ' '\n' | grep '^admon-' | sort | uniq); do
-		param="theme.icon."$(echo $doc_icon | sed -e 's/-/./');
-		params="$params --stringparam $param \"$doc_icon\""
-	    done
-	fi
-	if [ "x$doc_copy_icons" != "x1" -a "x$doc_icons_path" != "x" ]; then
-	    params="$params --stringparam theme.icon.admon.path \"$doc_icons_admon_path\""
-	fi
-	if [ "x$doc_admon_graphics_size" != "x" ]; then
-	    params="$params --stringparam theme.icon.admon.size \"$doc_icons_admon_size\""
-	fi
-
-	if [ "x$doc_custom_xslt" != "x" ]; then
-	    cmd="echo '<stylesheet xmlns=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\
-                       <import href=\"$xsltdir/mallard/html/mal2$doc_format.xsl\"/>\
-                       <include href=\"$doc_custom_xslt\"/></stylesheet>' |\
-                 xsltproc --nonet --xinclude $params -o \"$doc_outdir/$doc_outfile\"\
-                 - \"$doc_indir/$doc_infile\""
-	else
-	    cmd="xsltproc --nonet --xinclude $params -o \"$doc_outdir/$doc_outfile\"\
-                 \"$xsltdir/mallard/html/mal2$doc_format.xsl\" \"$doc_indir/$doc_infile\""
-	fi
-	echo_verbose "$cmd"
-	eval "$cmd"
-
-	if [ "x$doc_no_figures" != "x1" -a "$doc_indir" != "$doc_outdir" ]; then
-	    echo "$XSL_MALLARD_MEDIA" \
-		| xsltproc --nonet --xinclude - "$doc_indir/$doc_infile" \
-		| while read doc_media; do
-		mkdir_p "$doc_outdir/"`dirname "$doc_media"`
-		cmd="cp \"$doc_indir/$doc_media\" \"$doc_outdir/$doc_media\""
-		echo_verbose "$cmd"
-		eval "$cmd"
-	    done
-	fi
-    done
-    copy_icons
-}
-
-create_css() {
-    longopts='
-      -loutput:
-      -lverbose
-      -lversion
-      -lhelp
-    ';
-    options=`getopt -qn$progname $longopts -- o:vVh "$@"`
-    if [ "$?" != "0" ]; then print_help_css 1>&2; exit 1; fi
-    eval set -- "$options";
-    while [ "$1" != "--" ]; do
-	case "$1" in
-	    -o | --output)
-		doc_output="$2";;
-
-	    -v | --verbose)
-		doc_verbose=1;;
-
-	    -V | --version)
-		echo "$PROGRAM ($PACKAGE) $VERSION"
-		exit 0;;
-	    -h | --help)
-		print_help_css
-		exit 0;;
-	    --)
-		print_help_css 1>&2
-		exit 1;;
-	esac
-	shift
-    done
-    shift
-
-    doc_input_page="$1"
-    if [ "x$doc_input_page" = "x" ]; then
-	doc_input_page="index.page"
-    fi
-    if [ "x$doc_output" = "x" ]; then
-	doc_output="index.css"
-    fi
-
-    echo_verbose "Creating $doc_output using $doc_input_page"
-    echo "$XSL_MALLARD_CSS" | xsltproc -o "$doc_output" - "$doc_input_page";
-}
-
-convert_2html() {
-    doc_format="$1"
-    shift
-    longopts='
-      -lcss-file:
-      -lchunk-depth:
-      -lextension:
-      -lno-figures
-      -loutput:
-      -lcustom-xslt:
-      -lcopy-graphics
-      -ladmon-graphics-path:
-      -ladmon-graphics-size:
-      -lclasssynopsis-language:
-      -lfuncsynopsis-style:
-      -lverbose
-      -lversion
-      -lhelp
-    ';
-    options=`getopt -qn$progname $longopts -- c:d:e:o:x:nvVh "$@"`
-    if [ "$?" != "0" ]; then print_help_html $doc_format 1>&2; exit 1; fi
-    eval set -- "$options";
-    while [ "$1" != "--" ]; do
-	case "$1" in
-	    -c | --css-file)
-		doc_css_file="$2";;
-	    -d | --chunk-depth)
-		doc_chunk_depth="$2";;
-	    -e | --extension)
-		doc_extension="$2";;
-	    -n | --no-figures)
-		doc_no_figures="1";;
-	    -o | --output)
-		doc_output="$2";;
-	    -x | --custom-xslt)
-		doc_custom_xslt="$2";;
-
-	    --copy-graphics)
-		doc_copy_icons="1";;
-	    --admon-graphics-path)
-		doc_icons_admon_path="$2";;
-	    --admon-graphics-size)
-		doc_icons_admon_size="$2";;
-	    --classsynopsis-language)
-		doc_classsynopsis_language="$2";;
-	    --funcsynopsis-style)
-		doc_funcsynopsis_style="$2";;
-
-	    -v | --verbose)
-		doc_verbose=1;;
-
-	    -V | --version)
-		echo "$PROGRAM ($PACKAGE) $VERSION"
-		exit 0;;
-	    -h | --help)
-		print_help_html $doc_format
-		exit 0;;
-	    --)
-		print_help_html $doc_format 1>&2
-		exit 1;;
-	esac
-	shift
-    done
-    shift
-
-    if [ "$#" = "0" ]; then print_help_html $doc_format 1>&2; exit 1; fi
-    if [ "x$(echo "$1" | sed -e 's/.*\.//')" = "xpage" -o -d "$1" ]; then
-	convert_mallard2html $@;
-    else
-	convert_docbook2html $@;
-    fi
-    exit 0
-}
-
-
-command="$1";
-if [ "x$command" = "x" ]; then
-    print_help 1>&2;
-    exit 1;
-fi;
-shift;
-if [ "$command" = "html" -o "$command" = "xhtml" ]; then
-    convert_2html "$command" $@;
-elif [ "$command" = "css" ]; then
-    create_css $@;
-elif [ "$command" = "list-icons" ]; then
-    list_icons $@;
-elif [ "$command" = "list-media" ]; then
-    list_media $@;
-elif [ "$command" = "-V" -o "$command" = "--version" ]; then
-    echo "$PROGRAM ($PACKAGE) $VERSION";
-    exit 0;
-elif [ "$command" = "help" ]; then
-    print_help;
-    exit 0;
-else
-    print_help 1>&2;
-    exit 1;
-fi;
-
diff --git a/tools/gnome-doc-utils.m4 b/tools/gnome-doc-utils.m4
deleted file mode 100644
index 402bb3e..0000000
--- a/tools/gnome-doc-utils.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-dnl Do not call GNOME_DOC_DEFINES directly.  It is split out from
-dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
-AC_DEFUN([GNOME_DOC_DEFINES],
-[
-AC_ARG_WITH([help-dir],
-  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-  [with_help_dir='${datadir}/gnome/help'])
-HELP_DIR="$with_help_dir"
-AC_SUBST(HELP_DIR)
-
-AC_ARG_WITH([omf-dir],
-  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-  [with_omf_dir='${datadir}/omf'])
-OMF_DIR="$with_omf_dir"
-AC_SUBST(OMF_DIR)
-
-AC_ARG_WITH([help-formats],
-  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-  [with_help_formats=''])
-DOC_USER_FORMATS="$with_help_formats"
-AC_SUBST(DOC_USER_FORMATS)
-
-AC_ARG_ENABLE([scrollkeeper],
-	[AC_HELP_STRING([--disable-scrollkeeper],
-			[do not make updates to the scrollkeeper database])],,
-	enable_scrollkeeper=yes)
-AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-
-dnl disable scrollkeeper automatically for distcheck
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-])
-
-# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-#
-AC_DEFUN([GNOME_DOC_INIT],
-[AC_REQUIRE([AC_PROG_LN_S])dnl
-
-ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-
-AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
-PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-	[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-
-if test "$gdu_cv_have_gdu" = "yes"; then
-	AC_MSG_RESULT([yes])
-	ifelse([$2],,[:],[$2])
-else
-	AC_MSG_RESULT([no])
-	ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
-fi
-
-GNOME_DOC_DEFINES
-])
diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make
deleted file mode 100644
index 97fd549..0000000
--- a/tools/gnome-doc-utils.make
+++ /dev/null
@@ -1,655 +0,0 @@
-# gnome-doc-utils.make - make magic for building documentation
-# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-################################################################################
-## @@ Generating Header Files
-
-## @ DOC_H_FILE
-## The name of the header file to generate
-DOC_H_FILE ?=
-
-## @ DOC_H_DOCS
-## The input DocBook files for generating the header file
-DOC_H_DOCS ?=
-
-$(DOC_H_FILE): $(DOC_H_DOCS);
-	@rm -f $@.tmp; touch $@.tmp;
-	echo 'const gchar* documentation_credits[] = {' >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  xsltproc --path "$$xmlpath" $(_credits) $$doc; \
-	done | sort | uniq \
-	  | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
-	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
-	echo '	NULL' >> $@.tmp
-	echo '};' >> $@.tmp
-	echo >> $@.tmp
-	list='$(DOC_H_DOCS)'; for doc in $$list; do \
-	  xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
-	  if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
-	  docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
-	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
-	  echo $$xmlpath; \
-	  ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
-	  for id in $$ids; do \
-	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
-	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-	  done; \
-	  echo >> $@.tmp; \
-	done;
-	cp $@.tmp $@ && rm -f $@.tmp
-
-dist-check-gdu:
-if !HAVE_GNOME_DOC_UTILS
-	@echo "*** GNOME Doc Utils must be installed in order to make dist"
-	@false
-endif
-
-.PHONY: dist-doc-header
-dist-doc-header: $(DOC_H_FILE)
-	@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
-	$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-
-doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
-
-.PHONY: clean-doc-header
-_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-clean-local: $(_clean_doc_header)
-distclean-local: $(_clean_doc_header)
-mostlyclean-local: $(_clean_doc_header)
-maintainer-clean-local: $(_clean_doc_header)
-clean-doc-header:
-	rm -f $(DOC_H_FILE)
-
-all: $(DOC_H_FILE)
-
-
-################################################################################
-## @@ Generating Documentation Files
-
-## @ DOC_MODULE
-## The name of the document being built
-DOC_MODULE ?=
-
-## @ DOC_ID
-## The unique identifier for a Mallard document
-DOC_ID ?=
-
-## @ DOC_PAGES
-## Page files in a Mallard document
-DOC_PAGES ?=
-
-## @ DOC_ENTITIES
-## Files included with a SYSTEM entity
-DOC_ENTITIES ?=
-
-## @ DOC_INCLUDES
-## Files included with XInclude
-DOC_INCLUDES ?=
-
-## @ DOC_FIGURES
-## Figures and other external data
-DOC_FIGURES ?=
-
-## @ DOC_FORMATS
-## The default formats to be built and installed
-DOC_FORMATS ?= docbook
-_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
-
-## @ DOC_LINGUAS
-## The languages this document is translated into
-DOC_LINGUAS ?=
-_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
-	$(filter $(LINGUAS),$(DOC_LINGUAS)),					\
-	$(DOC_LINGUAS))
-
-_DOC_ABS_SRCDIR = @abs_srcdir@
-
-
-################################################################################
-## Variables for Bootstrapping
-
-_xml2po ?= `which xml2po`
-_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-
-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-
-if ENABLE_SK
-_ENABLE_SK = true
-_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
-_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-endif
-
-
-################################################################################
-## @@ Rules for OMF Files
-
-db2omf_args =									\
-	--stringparam db2omf.basename $(DOC_MODULE)				\
-	--stringparam db2omf.format $(3)					\
-	--stringparam db2omf.dtd						\
-	$(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 		\
-		| sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/')			\
-	--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2)))	\
-	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
-	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
-	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
-	$(if $(_ENABLE_SK),							\
-	  --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)")		\
-	$(_db2omf) $(2)
-
-## @ _DOC_OMF_IN
-## The OMF input file
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
-
-## @ _DOC_OMF_DB
-## The OMF files for DocBook output
-_DOC_OMF_DB = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
-
-$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
-$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
-	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
-	  echo "Please check your ScrollKeeper installation." >&2;		\
-	  exit 1; }
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_HTML
-## The OMF files for HTML output
-_DOC_OMF_HTML = $(if $(_DOC_OMF_IN),						\
-	$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
-
-$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
-$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
-if ENABLE_SK
-	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
-	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
-	  echo "Please check your ScrollKeeper installation." >&2;		\
-	  exit 1; }
-endif
-	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_ALL
-## All OMF output files to be built
-# FIXME
-_DOC_OMF_ALL =									\
-	$(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
-
-.PHONY: omf
-omf: $(_DOC_OMF_ALL)
-
-
-################################################################################
-## @@ C Locale Documents
-
-## @ _DOC_C_MODULE
-## The top-level documentation file in the C locale
-_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-
-## @ _DOC_C_PAGES
-## Page files in a Mallard document in the C locale
-_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-
-## @ _DOC_C_ENTITIES
-## Files included with a SYSTEM entity in the C locale
-_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-
-## @ _DOC_C_XINCLUDES
-## Files included with XInclude in the C locale
-_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
-
-## @ _DOC_C_DOCS
-## All documentation files in the C locale
-_DOC_C_DOCS =								\
-	$(_DOC_C_ENTITIES)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)		$(_DOC_C_MODULE)
-
-## @ _DOC_C_DOCS_NOENT
-## All documentation files in the C locale,
-## except files included with a SYSTEM entity
-_DOC_C_DOCS_NOENT =							\
-	$(_DOC_C_MODULE)	$(_DOC_C_INCLUDES)			\
-	$(_DOC_C_PAGES)
-
-## @ _DOC_C_FIGURES
-## All figures and other external data in the C locale
-_DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
-	$(foreach fig,$(DOC_FIGURES),C/$(fig)),				\
-	$(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
-
-## @ _DOC_C_HTML
-## All HTML documentation in the C locale
-# FIXME: probably have to shell escape to determine the file names
-_DOC_C_HTML = $(foreach f,						\
-	$(shell xsltproc --xinclude 					\
-	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
-	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
-	C/$(f).xhtml)
-
-###############################################################################
-## @@ Other Locale Documentation
-
-## @ _DOC_POFILES
-## The .po files used for translating the document
-_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
-.PHONY: po
-po: $(_DOC_POFILES)
-
-## @ _DOC_MOFILES
-## The .mo files used for translating the document
-_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
-
-.PHONY: mo
-mo: $(_DOC_MOFILES)
-
-## @ _DOC_LC_MODULES
-## The top-level documentation files in all other locales
-_DOC_LC_MODULES = $(if $(DOC_MODULE),						\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-## @ _DOC_LC_PAGES
-## Page files in a Mallard document in all other locales
-_DOC_LC_PAGES =									\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES),	\
-		$(lc)/$(notdir $(page)) ))
-
-## @ _DOC_LC_XINCLUDES
-## Files included with XInclude in all other locales
-_DOC_LC_INCLUDES =								\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES),	\
-		$(lc)/$(notdir $(inc)) ))
-
-## @ _DOC_LC_HTML
-## All HTML documentation in all other locales
-# FIXME: probably have to shell escape to determine the file names
-_DOC_LC_HTML =									\
-	$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML),		\
-		$(lc)/$(notdir $(doc)) ))
-
-## @ _DOC_LC_DOCS
-## All documentation files in all other locales
-_DOC_LC_DOCS =									\
-	$(_DOC_LC_MODULES)	$(_DOC_LC_INCLUDES)	$(_DOC_LC_PAGES)	\
-	$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
-## @ _DOC_LC_FIGURES
-## All figures and other external data in all other locales
-_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS),				\
-	$(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
-
-_DOC_SRC_FIGURES =								\
-	$(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS),	\
-		$(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-
-$(_DOC_POFILES):
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	@if test ! -f $@ -a -f $(srcdir)/$@; then \
-	  echo "cp $(srcdir)/$@ $@"; \
-	  cp "$(srcdir)/$@" "$@"; \
-	fi;
-	@docs=; \
-	list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
-	  docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
-	done; \
-	if ! test -f $@; then \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
-	else \
-	  echo "(cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
-	  (cd $(dir $@) && \
-	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
-	fi
-
-$(_DOC_MOFILES): %.mo: %.po
-	@if ! test -d $(dir $@); then \
-	  echo "mkdir $(dir $@)"; \
-	  mkdir "$(dir $@)"; \
-	fi
-	msgfmt -o $@ $<
-
-# FIXME: fix the dependancy
-# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
-$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
-	if ! test -d $(dir $@); then mkdir $(dir $@); fi
-	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
-	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
-	if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
-	(cd $(dir $@) && \
-	  $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
-	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
-	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-
-## @ _DOC_POT
-## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
-.PHONY: pot
-pot: $(_DOC_POT)
-$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-	$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
-
-################################################################################
-## @@ All Documentation
-
-## @ _DOC_HTML_ALL
-## All HTML documentation, only if it's built
-_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
-	$(_DOC_C_HTML) $(_DOC_LC_HTML))
-
-_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
-
-$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-
-
-################################################################################
-## All
-
-all:							\
-	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
-	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\
-	$(_DOC_HTML_ALL)	$(_DOC_POFILES)
-
-
-################################################################################
-## Clean
-
-.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
-clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
-clean-doc-lc:
-	rm -f $(_DOC_LC_DOCS)
-	rm -f $(_DOC_MOFILES)
-	@list='$(_DOC_POFILES)'; for po in $$list; do \
-	  if ! test "$$po" -ef "$(srcdir)/$$po"; then \
-	    echo "rm -f $$po"; \
-	    rm -f "$$po"; \
-	  fi; \
-	done
-#	.xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc/.xml2po.mo"; then \
-	    echo "rm -f $$lc/.xml2po.mo"; \
-	    rm -f "$$lc/.xml2po.mo"; \
-	  fi; \
-	done
-clean-doc-dir: clean-doc-lc
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  for dir in `find $$lc -depth -type d`; do \
-	    if ! test $$dir -ef $(srcdir)/$$dir; then \
-	      echo "rmdir $$dir"; \
-	      rmdir "$$dir"; \
-	   fi; \
-	  done; \
-	done
-
-_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
-_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
-_clean_lc  = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-
-clean-local:						\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-distclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-mostlyclean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-maintainer-clean-local:					\
-	$(_clean_omf)		$(_clean_dsk)		\
-	$(_clean_lc)		$(_clean_dir)
-
-
-
-################################################################################
-## Dist
-
-.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: 						\
-	$(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs)	\
-	$(if $(_DOC_C_FIGURES),dist-doc-figs)		\
-	$(if $(_DOC_OMF_IN),dist-doc-omf)
-#	$(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo " $(mkinstalldirs) $(distdir)/$$lc"; \
-	  $(mkinstalldirs) "$(distdir)/$$lc"; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
-	for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	    docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$docdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$docdir"; \
-	    fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
-	  $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
-	done
-
-dist-doc-figs: $(_DOC_SRC_FIGURES)
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
-	for fig in $$list; do \
-	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$fig"; then \
-	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    if ! test -d "$(distdir)/$$figdir"; then \
-	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
-	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
-	    fi; \
-	    echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
-	    $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
-	  fi; \
-	done;
-
-dist-doc-omf:
-	@if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
-
-dist-doc-dsk:
-	@if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
-	echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
-	$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-
-
-################################################################################
-## Check
-
-.PHONY: check-doc-docs check-doc-omf
-check:							\
-	$(if $(DOC_MODULE),check-doc-docs)		\
-	$(if $(DOC_ID),check-doc-pages)			\
-	$(if $(_DOC_OMF_IN),check-doc-omf)
-
-check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
-	  xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
-	done
-
-check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-	for lc in C $(_DOC_REAL_LINGUAS); do \
-	  if test -f "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  for page in $(DOC_PAGES); do \
-	    echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-	    xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-	  done; \
-	done
-
-check-doc-omf: $(_DOC_OMF_ALL)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-	  xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
-	done
-
-
-
-################################################################################
-## Install
-
-.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-
-_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-
-install-data-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),install-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),install-doc-html)		\
-	$(if $(_DOC_C_FIGURES),install-doc-figs)	\
-	$(if $(_DOC_OMF_IN),install-doc-omf)
-#	$(if $(_DOC_DSK_IN),install-doc-dsk)
-
-install-doc-docs:
-	@for lc in C $(_DOC_REAL_LINGUAS); do \
-	  echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-	  $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
-	done
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-	  docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	  docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
-	  if ! test -d "$$docdir"; then \
-	    echo "$(mkinstalldirs) $$docdir"; \
-	    $(mkinstalldirs) "$$docdir"; \
-	  fi; \
-	  echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
-	done
-
-install-doc-figs:
-	@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
-	  for lc in C $(_DOC_REAL_LINGUAS); do \
-	    figsymlink=false; \
-	    if test -f "$$lc/$$fig"; then \
-	      figfile="$$lc/$$fig"; \
-	    elif test -f "$(srcdir)/$$lc/$$fig"; then \
-	      figfile="$(srcdir)/$$lc/$$fig"; \
-	    else \
-	      figsymlink=true; \
-	    fi; \
-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-	    figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
-	    if ! test -d "$$figdir"; then \
-	      echo "$(mkinstalldirs) $$figdir"; \
-	      $(mkinstalldirs) "$$figdir"; \
-	    fi; \
-	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
-	    if $$figsymlink; then \
-	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
-	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
-	    else \
-	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
-	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
-	    fi; \
-	  done; \
-	done
-
-install-doc-html:
-	echo install-html
-
-install-doc-omf:
-	$(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
-	done
-	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	  echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	  scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-	fi;
-
-install-doc-dsk:
-	echo install-dsk
-
-
-
-################################################################################
-## Uninstall
-
-.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
-uninstall-local:					\
-	$(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs)	\
-	$(if $(_DOC_HTML_ALL),uninstall-doc-html)	\
-	$(if $(_DOC_C_FIGURES),uninstall-doc-figs)	\
-	$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-#	$(if $(_DOC_DSK_IN),uninstall-doc-dsk)
-
-uninstall-doc-docs:
-	@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-	  echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-	done
-
-uninstall-doc-figs:
-	@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-	  echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	  rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-	done;
-
-uninstall-doc-omf:
-	@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-	  if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	    echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	    scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  fi; \
-	  echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	  rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-	done
diff --git a/tools/gnome-doc-utils.pc.in b/tools/gnome-doc-utils.pc.in
deleted file mode 100644
index df859c7..0000000
--- a/tools/gnome-doc-utils.pc.in
+++ /dev/null
@@ -1,18 +0,0 @@
-prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-icondir=${datadir}/gnome-doc-utils/icons
-xmldir=${datadir}/xml
-xsltdir=${xmldir}/gnome/xslt
-gettext=${xsltdir}/gettext/gettext.xsl
-db2html=${xsltdir}/docbook/html/db2html.xsl
-db2xhtml=${xsltdir}/docbook/html/db2xhtml.xsl
-db2omf=${xsltdir}/docbook/omf/db2omf.xsl
-mal2html=${xsltdir}/mallard/html/mal2html.xsl
-mal2xhtml=${xsltdir}/mallard/html/mal2xhtml.xsl
-malrnc=${xmldir}/mallard/1.0/mallard.rnc
-malrng=${xmldir}/mallard/1.0/mallard.rng
-
-Name: gnome-doc-utils
-Description: GNOME Documentation Utilities
-Version: @VERSION@
diff --git a/yelp-tools.doap b/yelp-tools.doap
index 267c445..4d56a3d 100644
--- a/yelp-tools.doap
+++ b/yelp-tools.doap
@@ -20,11 +20,4 @@
       <gnome:userid>shaunm</gnome:userid>
     </foaf:Person>
   </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Danilo Šegan</foaf:name>
-      <foaf:mbox rdf:resource="mailto:danilo@gnome.org" />
-      <gnome:userid>danilo</gnome:userid>
-    </foaf:Person>
-  </maintainer>
 </Project>