summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2017-03-28 16:26:17 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2017-05-08 13:13:29 +0100
commit8d1fcc8e4c1939d52fb7ae46c368ac803c6770d7 (patch)
tree959e91b61fcfbbea3d7c2bf6d859aed6c13efd78
parentad2654b176b6a6d41df5a14eb2e26b678b5a5692 (diff)
downloadclutter-gtk-8d1fcc8e4c1939d52fb7ae46c368ac803c6770d7.tar.gz
docs: Remove unnecessary ancillary version file
GTK-Doc exposes the various package metadata as entities to be included already.
-rw-r--r--configure.ac3
-rw-r--r--doc/Makefile.am3
-rw-r--r--doc/clutter-gtk-1.0-docs.xml23
-rw-r--r--doc/version.xml.in1
4 files changed, 10 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index b8dd3cb..a5cc8a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,7 @@ AC_SUBST(GTK_PREFIX)
AC_SUBST(GDK_PIXBUF_PREFIX)
AC_SUBST(CLUTTER_PREFIX)
-GTK_DOC_CHECK([1.14], [--flavour=no-tmpl])
+GTK_DOC_CHECK([1.24], [--flavour=no-tmpl])
GOBJECT_INTROSPECTION_CHECK([0.9.12])
@@ -211,7 +211,6 @@ AC_CONFIG_FILES([
clutter-gtk/gtk-clutter-version.h
doc/Makefile
- doc/version.xml
examples/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 92125bf..c22cef8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -61,7 +61,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
+content_files=
# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
# These files must be listed here *and* in content_files
@@ -82,4 +82,3 @@ include $(top_srcdir)/gtk-doc.make
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
diff --git a/doc/clutter-gtk-1.0-docs.xml b/doc/clutter-gtk-1.0-docs.xml
index 76c5d7a..c89a361 100644
--- a/doc/clutter-gtk-1.0-docs.xml
+++ b/doc/clutter-gtk-1.0-docs.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
+<!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 % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+ %gtkdocentities;
]>
<book id="clutter-gtk" lang="en" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
- <title>Clutter-Gtk &version; Reference Manual</title>
- <releaseinfo>Version &version;</releaseinfo>
+ <title>Clutter-Gtk 1.0 Reference Manual</title>
+ <releaseinfo>for Clutter-GTK &package_version;</releaseinfo>
<copyright>
<year>2006, 2007, 2008, 2009</year>
@@ -99,21 +102,11 @@
<xi:include href="xml/api-index-1.0.xml"><xi:fallback /></xi:include>
</index>
- <index role="1.2">
- <title>Index of new symbols in 1.2</title>
- <xi:include href="xml/api-index-1.2.xml"><xi:fallback /></xi:include>
- </index>
-
<index role="1.4">
<title>Index of new symbols in 1.4</title>
<xi:include href="xml/api-index-1.4.xml"><xi:fallback /></xi:include>
</index>
- <index role="1.6">
- <title>Index of new symbols in 1.6</title>
- <xi:include href="xml/api-index-1.6.xml"><xi:fallback /></xi:include>
- </index>
-
<index role="deprecated">
<title>Index of deprecated symbols</title>
<xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
diff --git a/doc/version.xml.in b/doc/version.xml.in
deleted file mode 100644
index 27323da..0000000
--- a/doc/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@VERSION@ \ No newline at end of file