build: Port themes documentation to yelp-tools

gnome-doc-utils is considered deprecated, so documentation using
it should be dropped or moved to the new yelp-tools.
Given that the theme format is rather cryptic, still used by mutter
and documentation on it quite spare, dropping the documentation in
question doesn't seem like a good idea, so move to yelp-tools instead.
As this effectively adds a dependency on GNOME 3, provide a configure
switch to disable the documentation to allow builds on "pure" GNOME 2.x
systems.

6 files changed, 21 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index dac09293..416b9aa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,11 +15,12 @@ doc/Makefile
 doc/Makefile.in
 doc/creating_themes/*/*.mo
 doc/creating_themes/*/*.xml
+doc/creating_themes/*/*.docbook
+doc/creating_themes/*/*.stamp
 doc/creating_themes/Makefile
 doc/creating_themes/Makefile.in
 doc/man/Makefile
 doc/man/Makefile.in
-gnome-doc-utils.make
 install-sh
 intltool-extract.in
 intltool-merge.in
diff --git a/autogen.sh b/autogen.sh
index 1159af27..75f1cfb3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,4 @@ which gnome-autogen.sh || {
     echo "your distribution's package manager)."
     exit 1
 }
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index 3bdf04f6..68aea07a 100644
--- a/configure.in
+++ b/configure.in
@@ -502,8 +502,15 @@ if test "x$GCC" = "xyes"; then
   CFLAGS="$CFLAGS -Wall -ansi"
 fi
 
-# Use gnome-doc-utils:
-GNOME_DOC_INIT([0.8.0])
+AC_ARG_ENABLE(themes-documentation,
+  AC_HELP_STRING([--disable-themes-documentation],
+                 [disable building themes documentation on system where yelp-tools is unavailable]),,
+  enable_themes_documentation=yes)
+AM_CONDITIONAL(BUILD_THEMES_DOCS, test "$enable_themes_documentation" = "yes")
+
+if test x$enable_themes_documentation = xyes; then
+  YELP_HELP_INIT
+fi
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 09feb1da..6784ec22 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = man creating_themes
+SUBDIRS = man
+
+if BUILD_THEMES_DOCS
+  SUBDIRS += creating_themes
+endif
 
 EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt
diff --git a/doc/creating_themes/C/creating-metacity-themes.xml b/doc/creating_themes/C/index.docbook
index 045cae28..045cae28 100644
--- a/doc/creating_themes/C/creating-metacity-themes.xml
+++ b/doc/creating_themes/C/index.docbook
diff --git a/doc/creating_themes/Makefile.am b/doc/creating_themes/Makefile.am
index 6abc2d38..65d8fad5 100644
--- a/doc/creating_themes/Makefile.am
+++ b/doc/creating_themes/Makefile.am
@@ -1,24 +1,15 @@
 ### This part of Makefile.am can be customized by you.
 
-# gnome-doc-utils standard variables:
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
 # The name of the directory in /usr/share/gnome/help/, 
 # and the name of the main .xml file:
-DOC_MODULE = creating-metacity-themes
+HELP_ID = creating-metacity-themes
 
-# The names of any files included via entity declarations.
-DOC_ENTITIES =
-
-# The names of any files included by xincluded (preferred):
-DOC_INCLUDES =
-
-# The names of any pictures:
-DOC_FIGURES = 
+HELP_FILES = index.docbook
 
 # The names of any locales for which documentation translations exist:
-DOC_LINGUAS = de
+HELP_LINGUAS = de