[gtk-doc] docs: Use new documentation infrastructure

[Stefan Kost <stefkost src gnome org>]

commit 4c7a75b7127e32020cf58ca1a1675adc24bfd54b
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Mar 23 18:04:18 2012 +0000

    docs: Use new documentation infrastructure
    
    gnome-doc-utils is being deprecated by yelp-tools

 Makefile.am                                        |    5 +---
 autogen.sh                                         |    9 ------
 configure.ac                                       |   27 +++++++++++--------
 help/Makefile.am                                   |    3 +-
 .../manual/C/{gtk-doc-manual.xml => index.docbook} |    0
 help/manual/Makefile.am                            |   21 ++++++---------
 help/manual/gtk-doc-manual.omf.in                  |   15 -----------
 7 files changed, 26 insertions(+), 54 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5725887..8e33c3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,8 +90,7 @@ EXTRA_DIST = \
 	tools/docpercentages.pl \
 	tools/gtk-doc.el \
 	style.css \
-	COPYING-DOCS \
-	gnome-doc-utils.make
+	COPYING-DOCS
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
@@ -116,8 +115,6 @@ GITIGNOREFILES = \
 	RELNOTES.txt \
 	ChangeLog-?.??
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-DISTCLEANFILES = gnome-doc-utils.make
 -include $(top_srcdir)/git.mk
 
 dist-hook:
diff --git a/autogen.sh b/autogen.sh
index 46c2137..27d4025 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,15 +7,6 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
-mkdir -p build-aux
-
-if gnome-doc-prepare --version < /dev/null > /dev/null 2>&1; then
-  echo "* Running gnome-doc-prepare"
-  gnome-doc-prepare --copy --force --automake
-else
-  touch gnome-doc-utils.make
-fi
-
 AUTORECONF=`which autoreconf`
 if test -z $AUTORECONF; then
         echo "*** No autoreconf found, please install it ***"
diff --git a/configure.ac b/configure.ac
index 5217f74..8259283 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,6 @@ AM_MAINTAINER_MODE([enable])
 # to make
 AM_SILENT_RULES([yes])
 
-dnl Forcing a non-null ACTION-IF-NOT-FOUND disables scrollkeeper if
-dnl gnome-doc-utils is not found but does not invalidate the build.
-GNOME_DOC_INIT([],[],enable_scrollkeeper=no)
-
 # Check for programs
 AC_PROG_CC
 
@@ -213,6 +209,16 @@ else
 fi
 AC_SUBST(TRACE)
 
+dnl
+dnl Documentation
+dnl
+have_yelp_tools=no
+m4_ifdef([YELP_HELP_INIT],[
+YELP_HELP_INIT
+have_yelp_tools=yes
+])
+AM_CONDITIONAL([HAVE_YELP_TOOLS],[test x$have_yelp_tools = xyes])
+
 AC_CONFIG_FILES([Makefile
 gtk-doc.pc
 gtk-doc.dsl
@@ -272,12 +278,6 @@ test -n "$JADE" \
 test -n "$DBLATEX$FOP" \
     && AC_MSG_NOTICE([** XML PDF support enabled, using $DBLATEX$FOP]) \
     || AC_MSG_NOTICE([   XML PDF support disabled, no fop available])
-test "x$gdu_cv_have_gdu" = "xyes" \
-    && AC_MSG_NOTICE([** Gnome-doc-utils support enabled]) \
-    || AC_MSG_NOTICE([   Gnome-doc-utils support disabled])
-test "x$enable_scrollkeeper" = "xyes" \
-    && AC_MSG_NOTICE([** Scrollkeeper support enabled]) \
-    || AC_MSG_NOTICE([   Scrollkeeper support disabled])
 test -n "$HIGHLIGHT" \
     && AC_MSG_NOTICE([** Syntax highlighting of examples enabled, using $HIGHLIGHT]) \
     || AC_MSG_NOTICE([   Syntax highlighting of examples disabled])
@@ -287,4 +287,9 @@ test "x$build_tests" != "xno" \
 test "x$enable_debug" != "xno" \
     && AC_MSG_NOTICE([** Debug tracing enabled]) \
     || AC_MSG_NOTICE([   Debug tracing disabled])
-
+test "x$enable_debug" != "xno" \
+    && AC_MSG_NOTICE([** Debug tracing enabled]) \
+    || AC_MSG_NOTICE([   Debug tracing disabled])
+test "x$have_yelp_tools" != "xno" \
+    && AC_MSG_NOTICE([** Documentation enabled]) \
+    || AC_MSG_NOTICE([   Documentation disabled])
diff --git a/help/Makefile.am b/help/Makefile.am
index fba5fca..6690244 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-if HAVE_GNOME_DOC_UTILS
+if HAVE_YELP_TOOLS
 SUBDIRS = manual
 endif
 
-
 -include $(top_srcdir)/git.mk
diff --git a/help/manual/C/gtk-doc-manual.xml b/help/manual/C/index.docbook
similarity index 100%
rename from help/manual/C/gtk-doc-manual.xml
rename to help/manual/C/index.docbook
diff --git a/help/manual/Makefile.am b/help/manual/Makefile.am
index 7deb0b5..8d75d5a 100644
--- a/help/manual/Makefile.am
+++ b/help/manual/Makefile.am
@@ -1,16 +1,11 @@
-if HAVE_GNOME_DOC_UTILS
-include $(top_srcdir)/build-aux/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-else
-dist-hook:
-	@echo "*** gnome-doc-utils must be installed and enabled in order to make dist"
-	@false
-endif
+ YELP_HELP_RULES@
 
-DOC_MODULE = gtk-doc-manual
-DOC_ENTITIES = fdl-appendix.xml
-DOC_INCLUDES =
-DOC_FIGURES =
-DOC_LINGUAS = bn_IN de el en_GB es fr gu sl sv ta te
+HELP_ID = gtk-doc-manual
+
+HELP_FILES = \
+        index.docbook \
+	fdl-appendix.xml
+
+HELP_LINGUAS = bn_IN de el en_GB es fr gu sl sv ta te
 
 -include $(top_srcdir)/git.mk