From 42a0b64716ac12da97f2de8582c4ee88c8fad1a9 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Fri, 19 Dec 2014 17:18:52 +0000
Subject: docs: Use gtk-doc entity functionality to drop version.xml

gtk-doc can now generate an entities file to do this for us.

This bumps our gtk-doc dependency to 1.25, which was released in March
2016.
---
 configure.ac                  | 3 +--
 docs/reference/Makefile.am    | 5 ++---
 docs/reference/gdata-docs.xml | 5 +++--
 docs/reference/version.xml.in | 1 -
 4 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 docs/reference/version.xml.in

diff --git a/configure.ac b/configure.ac
index 131b82a4..c685b098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+GTK_DOC_CHECK([1.25],[--flavour no-tmpl])
 
 AC_CONFIG_FILES([
 Makefile
@@ -216,6 +216,5 @@ gdata/tests/Makefile
 po/Makefile.in
 docs/Makefile
 docs/reference/Makefile
-docs/reference/version.xml
 ])
 AC_OUTPUT
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index ae2dbec0..ac8fa54e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -36,7 +36,7 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdata
 FIXXREF_OPTIONS=
 
 # Add the builddir to the HTML path so that version.xml is found
-MKHTML_OPTIONS=--path="$(abs_builddir)"
+MKHTML_OPTIONS=
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
@@ -80,7 +80,7 @@ HTML_IMAGES = \
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=version.xml gdata-overview.xml gdata-running.xml
+content_files=gdata-overview.xml gdata-running.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
@@ -106,7 +106,6 @@ SCANOBJ_FILES += $(DOC_MODULE).types
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += \
-	version.xml.in \
 	structure.dia \
 	data-flow.dia \
 	cancellation.dia \
diff --git a/docs/reference/gdata-docs.xml b/docs/reference/gdata-docs.xml
index c2af2011..cf1c8b8e 100644
--- a/docs/reference/gdata-docs.xml
+++ b/docs/reference/gdata-docs.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 	<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-	<!ENTITY version SYSTEM "version.xml">
+	<!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+	%gtkdocentities;
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
 	<bookinfo>
 		<title>GData Reference Manual</title>
-		<releaseinfo>for GData &version;.<!-- The latest version of this documentation can be found online at
+		<releaseinfo>for GData &package_version;.<!-- The latest version of this documentation can be found online at
 			<ulink role="online-location" url="http://[SERVER]/gdata/index.html">http://[SERVER]/gdata/</ulink>.-->
 		</releaseinfo>
 	</bookinfo>
diff --git a/docs/reference/version.xml.in b/docs/reference/version.xml.in
deleted file mode 100644
index 702ee662..00000000
--- a/docs/reference/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@GDATA_VERSION_MAJOR@.@GDATA_VERSION_MINOR@.@GDATA_VERSION_MICRO@
-- 
cgit v1.2.1