[libgdata] docs: Use the no-tmpl flavour of gtk-doc

[Philip Withnall <pwithnall src gnome org>]

commit 2de2eef36afabb71a9a1e19168fbda03e8afdce1
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Aug 22 13:44:06 2010 +0100

    docs: Use the no-tmpl flavour of gtk-doc
    
    This removes the need for the outdated tmpl directory, and means we now
    require gtk-doc >= 1.14.

 autogen.sh                 |    2 +-
 configure.ac               |    2 +-
 docs/reference/Makefile.am |   13 ++-----------
 3 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 6da0f8e..5222841 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
 	exit 1
 }
 
-REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-gtk-doc "$@"
+REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.9 REQUIRED_GTK_DOC_VERSION=1.14 USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-gtk-doc "$@"
diff --git a/configure.ac b/configure.ac
index b61c93b..19fbdb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
-GTK_DOC_CHECK(1.0)
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 3ef40dd..2590879 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -31,10 +31,6 @@ SCAN_OPTIONS=--rebuild-types
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdata
 
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=
@@ -97,20 +93,15 @@ include $(top_srcdir)/gtk-doc.make
 # --rebuild-types
 SCANOBJ_FILES += $(DOC_MODULE).types
 
-# This should also be dealt with elsewhere, but we can't call gtkdocize
-# with --flavour=no-tmpl because of gnome-autogen.sh being out of our
-# control. Grrr.
 distclean-local: distclean-docs
 distclean-docs:
 	cd $(srcdir) && \
-	  rm -rf xml tmpl $(REPORT_FILES) \
+	  rm -rf xml $(REPORT_FILES) \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 maintainer-clean-local: maintainer-clean-docs
 maintainer-clean-docs: clean
-	cd $(srcdir) && rm -rf xml tmpl html
-
-GITIGNOREFILES = tmpl/
+	cd $(srcdir) && rm -rf xml html
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in