[glade/glade-3-14: 12/36] Use new documentation infrastructure

[Juan Pablo Ugarte <jpu src gnome org>]

commit 5228e74d23925ade95bd3b73873bd1bf0f24fd47
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Aug 14 11:42:11 2012 +0900

    Use new documentation infrastructure

 Makefile.am                         |   14 ++++----------
 configure.ac                        |    4 ++--
 help/C/{glade.xml => index.docbook} |    4 ++--
 help/C/legal.xml                    |    2 +-
 help/Makefile.am                    |   15 +++++++++------
 help/glade.omf.in                   |    9 ---------
 m4/.gitignore                       |    1 -
 7 files changed, 18 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index be6bbc4..43de26e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = po data gladeui src plugins doc
-
-if HAVE_GNOME_DOC_UTILS
-SUBDIRS += help
-endif
+SUBDIRS = po data gladeui src plugins doc help
 
 EXTRA_DIST = \
 	autogen.sh \
@@ -12,12 +8,10 @@ EXTRA_DIST = \
 	COPYING.LGPL \
 	intltool-extract.in \
 	intltool-merge.in \
-	intltool-update.in \
-	gnome-doc-utils.make
+	intltool-update.in
 
 DISTCLEANFILES = intltool-extract \
                  intltool-merge \
-                 intltool-update \
-                 gnome-doc-utils.make
+                 intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
diff --git a/configure.ac b/configure.ac
index bc43cce..86dc541 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,10 +190,10 @@ fi
 AM_CONDITIONAL(BUILD_PYTHON, test x"$have_python" = "xyes")
 
 # ==================================================================
-# Glade User Manual (requires gnome-doc-utils)
+# Glade User Manual (requires yelp-tools)
 # ==================================================================
 
-GNOME_DOC_INIT([0.18],[],[:])
+YELP_HELP_INIT
 
 dnl ================================================================
 dnl Check for windows
diff --git a/help/C/glade.xml b/help/C/index.docbook
similarity index 99%
rename from help/C/glade.xml
rename to help/C/index.docbook
index a97eaa8..985b36a 100644
--- a/help/C/glade.xml
+++ b/help/C/index.docbook
@@ -134,7 +134,7 @@
     <legalnotice> 
       <title>Feedback</title> 
       <para>To report a bug or make a suggestion regarding the &app; application or
-      this manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
+      this manual, follow the directions in the <ulink url="help:gnome-feedback"
 	  type="help">GNOME Feedback Page</ulink>.
       </para>
 <!-- Translators may also add here feedback address for translations -->
@@ -477,7 +477,7 @@ copies.</para>
       General Public license as published by the Free Software
       Foundation; either version 2 of the License, or (at your option)
       any later version. A copy of this license can be found at this
-      <ulink url="ghelp:gpl" type="help">link</ulink>, or in the file
+      <ulink url="help:gpl" type="help">link</ulink>, or in the file
       COPYING included with the source code of this program. </para>
   </sect1> 
 
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 312c12e..5d73dc0 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,7 +6,7 @@
            by the Free Software Foundation with no Invariant Sections,
            no Front-Cover Texts, and no Back-Cover Texts.  You can find
            a copy of the GFDL at this <ulink type="help"
-           url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+           url="help:fdl">link</ulink> or in the file COPYING-DOCS
            distributed with this manual.
           </para>
           <para> This manual is part of a collection of GNOME manuals
diff --git a/help/Makefile.am b/help/Makefile.am
index 70836e3..51dc5d9 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,12 @@
+ YELP_HELP_RULES@
 
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+HELP_ID = glade
 
-DOC_MODULE = glade
-DOC_INCLUDES = legal.xml
-DOC_FIGURES = figures/main-window.png
+HELP_FILES = \
+	index.docbook \
+	legal.xml
 
-DOC_LINGUAS = bg ca cs de el en_GB es eu fr gl hi it ja oc pt_BR ru sl sv uk zh_CN
+HELP_MEDIA = \
+	figures/main-window.png
+
+HELP_LINGUAS = bg ca cs de el en_GB es eu fr gl hi it ja oc pt_BR ru sl sv uk zh_CN
diff --git a/m4/.gitignore b/m4/.gitignore
index ba3faf5..9a93bad 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,4 +1,3 @@
-/gnome-doc-utils.m4
 /gtk-doc.m4
 /intltool.m4
 /libtool.m4