[gdm] Use new documentation infrastructure

[Ray Strode <halfline src gnome org>]

commit db048b2f38d19e5b965c8feb931a75a1c3384ff3
Author: Javier JardÃn <jjardon gnome org>
Date:   Sat Aug 11 00:00:11 2012 +0900

    Use new documentation infrastructure
    
    Use yelp-tools instead gnome-doc-utils
    
    https://bugzilla.gnome.org/show_bug.cgi?id=681604

 .gitignore       |   17 -
 Makefile.am      |   11 +-
 configure.ac     |   11 +-
 docs/C/gdm.xml   | 2287 ------------------------------------------------------
 docs/Makefile.am |   16 +-
 docs/gdm.omf.in  |   11 -
 omf.make         |   61 --
 xmldocs.make     |   95 ---
 8 files changed, 15 insertions(+), 2494 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60a4d5b..6b7574a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 *.pox
 *.tab.c
 .*.swp
-gdm.xml
 at-spi-registryd-wrapper.desktop.in
 ./autom4te.cache
 .deps
@@ -62,7 +61,6 @@ gdm-xdmcp-chooser-slave-glue.c
 gdm-xdmcp-greeter-display-glue.h
 gdm-greeter-glue.h
 gdm-greeter-glue.c
-gnome-doc-utils.make
 GNOME_FastUserSwitchApplet.server
 GNOME_FastUserSwitchApplet.server.in
 gnome-power-manager.desktop.in
@@ -84,17 +82,14 @@ Makefile.in
 Makefile.in.in
 na-marshal.c
 na-marshal.h
-oc/gdm.xml
 PostSession
 POTFILES
 PreSession
 so_locations
 stamp-h1
 stamp-it
-sv/gdm.xml
 tags
 TAGS
-uk/gdm.xml
 Xsession
 INSTALL
 aclocal.m4
@@ -127,17 +122,6 @@ data/applications/orca-screen-reader.desktop
 data/applications/polkit-gnome-authentication-agent-1.desktop
 data/applications/polkit-gnome-authentication-agent-1.desktop.in
 depcomp
-docs/gdm-C.omf
-docs/gdm-de.omf
-docs/gdm-en_GB.omf
-docs/gdm-es.omf
-docs/gdm-fr.omf
-docs/gdm-it.omf
-docs/gdm-ko.omf
-docs/gdm-oc.omf
-docs/gdm-ru.omf
-docs/gdm-sv.omf
-docs/gdm-uk.omf
 gui/libgdm/gdm-client-glue.h
 gui/libgdm/gdm-client-glue.c
 gui/libgdm/gdm-manager-glue.h
@@ -177,7 +161,6 @@ utils/gdmflexiserver
 *.pc
 *.gir
 *.typelib
-*.omf
 *.tar.*
 gdm-smartcard-worker
 dconf-override-db
diff --git a/Makefile.am b/Makefile.am
index c180854..7dd8bc2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,22 +13,13 @@ if ENABLE_DOCUMENTATION
 SUBDIRS += docs
 endif
 
-# add these when help gets added back
-# omf-install
-
 EXTRA_DIST = \
 	MAINTAINERS		\
 	ChangeLog		\
 	README			\
-	gnome-doc-utils.make	\
-	xmldocs.make		\
-	omf.make		\
 	$(NULL)
 
 DISTCLEANFILES = \
-	gnome-doc-utils.make	\
 	$(NULL)
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-split-authentication --enable-introspection --enable-documentation
-
-distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
+DISTCHECK_CONFIGURE_FLAGS = --enable-split-authentication --enable-introspection
diff --git a/configure.ac b/configure.ac
index 40774e5..8458b82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,10 +41,12 @@ AC_SUBST(VERSION)
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
-GNOME_DOC_INIT
-AC_ARG_ENABLE([documentation],
-	AS_HELP_STRING([--enable-documentation], [enable man pages and HTML documentation]),
-	[], [enable_documentation=yes])
+# Documentation
+enable_documentation=no
+m4_ifdef([YELP_HELP_INIT],[
+YELP_HELP_INIT
+enable_documentation=yes
+])
 AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
 
 # i18n stuff
@@ -1598,4 +1600,5 @@ echo \
         UPower support:           ${have_upower}
         Build with RBAC:          ${msg_rbac_shutdown}
         Initial VT:               ${GDM_INITIAL_VT}
+        Enable documentation:     ${enable_documentation}
 "
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 94b682c..9b2ef6a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,11 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = gdm
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_LINGUAS = ca de el en_GB es fr gl id it ko oc ru sl sv te uk zh_CN
-# ja zh_HK zh_TW need to be transitioned to gnome-doc-utils
+HELP_ID = gdm
 
-#man_MANS = gdm.1
-#EXTRA_DIST = gdm.1
+HELP_FILES = \
+	index.docbook	\
+	legal.xml
+
+HELP_LINGUAS = ca de el en_GB es fr gl id it ko oc ru sl sv te uk zh_CN