[glom] Port from gnome-doc-utils to yelp-tools

[Murray Cumming <murrayc src gnome org>]

commit de1c391856fc71f9c14566c0e5834be39ec2bfdb
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 2 12:49:47 2013 +0200

    Port from gnome-doc-utils to yelp-tools
    
    gnome-doc-utils is deprecated in favour of yelp-tools

 .gitignore                       |    1 -
 Makefile.am                      |   17 ++++++++---------
 autogen.sh                       |    2 --
 configure.ac                     |    3 +--
 docs/user-guide/Makefile.am      |   11 +++++------
 docs/user-guide/es/glom-C.es.omf |   30 ------------------------------
 docs/user-guide/glom.omf.in      |    9 ---------
 macros/.gitignore                |    1 -
 8 files changed, 14 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31f8df4..fb9e3f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ Makefile.in
 /dist-changelog.am
 /doc-reference.am
 /generate-binding.am
-/gnome-doc-utils.make
 /messages.mo
 /omf.make
 /xmldocs.make
diff --git a/Makefile.am b/Makefile.am
index f517f8a..d0eeced 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ## This project does not use recursive make, but a single toplevel Makefile
 ## to build the entire tree (excluding po and docs/user-guide as gettext and
-## gnome-doc-utils come with their own build systems).  Read Peter Miller's
+## yelp-tools (TODO: Still?) come with their own build systems).  Read Peter Miller's
 ## excellent paper to learn why recursive make invocations are both slow and
 ## error-prone:  http://miller.emu.id.au/pmiller/books/rmch/
 
@@ -40,12 +40,11 @@ doc_subdirs = docs/libglom_reference docs/pyglom_reference
 else
 doc_subdirs =
 endif
-if HAVE_GNOME_DOC_UTILS
-gnome_doc_subdirs = docs/user-guide
-else
-gnome_doc_subdirs =
-endif
-SUBDIRS = po $(doc_subdirs) $(gnome_doc_subdirs)
+
+# TODO: Allow this to be disabled, by letting YELP_HELP_INIT fail nicely as it could with GNOME_DOC_INIT?
+yelp_doc_subdirs = docs/user-guide
+
+SUBDIRS = po $(doc_subdirs) $(yelp_doc_subdirs)
 
 if HOST_WIN32
 win_resfile = glom/glom.res
@@ -262,7 +261,7 @@ mimepackagesdir = $(mimedir)/packages
 dist_mimepackages_DATA = glom.xml
 
 dist_template = glom/glom.rc glom.service.in
-dist_docutils = gnome-doc-utils.make omf.make xmldocs.make
+dist_docutils =
 dist_intltool = intltool-extract.in intltool-merge.in intltool-update.in
 dist_docfiles = docs/overview.txt docs/developer_documentation.txt \
                docs/postgres_test.c docs/postgres_gda_test.c win32/README
@@ -279,7 +278,7 @@ CLEANFILES = $(dbusservice_DATA) $(desktop_DATA) $(appdata_DATA) $(win_resfile)
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 MAINTAINERCLEANFILES += \
        $(dist_docutils) $(dist_intltool) \
-       macros/gnome-doc-utils.m4 macros/intltool.m4 \
+       macros/intltool.m4 \
        macros/libtool.m4 macros/ltoptions.m4 macros/ltsugar.m4 \
        macros/ltversion.m4 macros/lt~obsolete.m4
 
diff --git a/autogen.sh b/autogen.sh
index 8345e8b..3ea03ee 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,8 +3,6 @@ test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
 (
   cd "$srcdir" &&
-  gnome-doc-common --copy &&
-  gnome-doc-prepare --automake --copy --force &&
   mm-common-prepare --copy --force &&
   autopoint --force &&
   AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install
diff --git a/configure.ac b/configure.ac
index aa25e30..d63b13e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,8 +301,7 @@ AC_DEFINE_UNQUOTED([MYSQL_UTILS_PATH], ["$MYSQL_UTILS_PATH"],
                    [Define to the location of the MySQL utilities.])
 
 
-GNOME_DOC_INIT([0.9.0],,
-  [AC_MSG_WARN([[gnome-doc-utils not found: documentation will not be built.]])])
+YELP_HELP_INIT
 
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
diff --git a/docs/user-guide/Makefile.am b/docs/user-guide/Makefile.am
index 44bae17..9a7c5ca 100644
--- a/docs/user-guide/Makefile.am
+++ b/docs/user-guide/Makefile.am
@@ -1,12 +1,11 @@
 AUTOMAKE_OPTIONS = -Wno-portability
 
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 dist-hook: doc-dist-hook
 
-DOC_MODULE = glom
-DOC_ENTITIES =
-DOC_INCLUDES = legal.xml 
-DOC_FIGURES = \
+HELP_ID = glom
+HELP_EXTRA = legal.xml 
+HELP_MEDIA = \
        figures/glom_data_details.png \
        figures/glom_design_layout_details.png \
        figures/glom_design_reports.png \
@@ -25,4 +24,4 @@ DOC_FIGURES = \
        figures/glom_design_reports_group_by.png \
        figures/glom_report_result.png
 
-DOC_LINGUAS = cs de en_GB es fr sl sv
+HELP_LINGUAS = cs de en_GB es fr sl sv
diff --git a/macros/.gitignore b/macros/.gitignore
index 7785aae..6fb0fcd 100644
--- a/macros/.gitignore
+++ b/macros/.gitignore
@@ -1,4 +1,3 @@
-gnome-doc-utils.m4
 intltool.m4
 libtool.m4
 ltoptions.m4