From 08cae5cd63b3ed11fc8e18718bf3ba36d1c540ea Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 21 Nov 2008 07:28:50 +0000 Subject: [PATCH] Nicer indices svn path=/trunk/; revision=7665 --- ChangeLog | 5 +++++ configure.in | 2 +- docs/reference/ChangeLog | 7 +++++++ docs/reference/gio/Makefile.am | 2 +- docs/reference/glib/Makefile.am | 2 +- docs/reference/gobject/Makefile.am | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90614b1c9..22b1f824a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-21 Matthias Clasen + + * configure.in: Bump gtk-doc dependency to 1.11 for + nicer index-generation. + 2008-11-14 Matthias Clasen * NEWS: Updates diff --git a/configure.in b/configure.in index 6b6c7eb7f..52b093501 100644 --- a/configure.in +++ b/configure.in @@ -2591,7 +2591,7 @@ dnl ************************** dnl *** Checks for gtk-doc *** dnl ************************** -GTK_DOC_CHECK([1.8]) +GTK_DOC_CHECK([1.11]) AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man], diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 21d34eee5..b10413a08 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,10 @@ +2008-11-21 Matthias Clasen + + * glib/Makefile.am: + * gobject/Makefile.am: + * gio/Makefile.am: Use a new gtk-doc feature to generate + much nicer indices. + 2008-11-14 Matthias Clasen * glib/glib-sections.txt: Add G_STATIC_ASSERT and friends diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index 1227397aa..43e003f41 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -85,7 +85,7 @@ GTKDOC_LIBS = \ $(NULL) # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS = --output-format=xml --sgml-mode +MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g # Images to copy into HTML directory HTML_IMAGES = \ diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am index 1a3e83682..1c82f32f6 100644 --- a/docs/reference/glib/Makefile.am +++ b/docs/reference/glib/Makefile.am @@ -16,7 +16,7 @@ DOC_SOURCE_DIR=../../.. SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --output-format=xml +MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g # Used for dependencies HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am index c582e7927..0c8823439 100644 --- a/docs/reference/gobject/Makefile.am +++ b/docs/reference/gobject/Makefile.am @@ -17,7 +17,7 @@ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \ --ignore-decorators=G_GNUC_INTERNAL # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --output-format=xml +MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g # Used for dependencies HFILE_GLOB=$(top_srcdir)/gobject/*.h