From 3a2ae50bc91b9c2464a77faa796a02de17cd9c6f Mon Sep 17 00:00:00 2001 From: David Mohr Date: Thu, 22 Apr 2010 09:31:25 -0600 Subject: [PATCH] Link the gtkdocs to glib/gobject --- configure.ac.in | 2 +- docs/reference/Makefile.am | 4 +++- docs/reference/tmpl/xfconf-backend.sgml | 3 +++ docs/reference/tmpl/xfconf-binding.sgml | 3 +++ docs/reference/tmpl/xfconf-channel.sgml | 3 +++ docs/reference/tmpl/xfconf-errors.sgml | 3 +++ docs/reference/tmpl/xfconf-types.sgml | 3 +++ docs/reference/tmpl/xfconf.sgml | 4 ++++ 8 files changed, 23 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index ca031b9..a93cbfa 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -23,7 +23,7 @@ AC_INIT([xfconf], [xfconf_version], [http://bugzilla.xfce.org/]) AC_PREREQ([2.50]) dnl init automake -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) +AM_INIT_AUTOMAKE([1.8 dist-bzip2]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 4240771..3d1b33b 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -63,7 +63,9 @@ INCLUDES = \ GTKDOC_LIBS = \ $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la \ - $(top_builddir)/xfconfd/xfconfd-xfconf-backend.o + $(top_builddir)/xfconfd/xfconfd-xfconf-backend.o \ + $(GLIB_LIBS) \ + $(GOBJECT_LIBS) include $(top_srcdir)/gtk-doc.make diff --git a/docs/reference/tmpl/xfconf-backend.sgml b/docs/reference/tmpl/xfconf-backend.sgml index a9e9d14..56c514b 100644 --- a/docs/reference/tmpl/xfconf-backend.sgml +++ b/docs/reference/tmpl/xfconf-backend.sgml @@ -20,6 +20,9 @@ one could think of to store data. + + + diff --git a/docs/reference/tmpl/xfconf-binding.sgml b/docs/reference/tmpl/xfconf-binding.sgml index 74aa960..77ce4ee 100644 --- a/docs/reference/tmpl/xfconf-binding.sgml +++ b/docs/reference/tmpl/xfconf-binding.sgml @@ -25,6 +25,9 @@ all this. + + + diff --git a/docs/reference/tmpl/xfconf-channel.sgml b/docs/reference/tmpl/xfconf-channel.sgml index bf16414..ef669c5 100644 --- a/docs/reference/tmpl/xfconf-channel.sgml +++ b/docs/reference/tmpl/xfconf-channel.sgml @@ -20,6 +20,9 @@ configuration keys with the same names. + + + diff --git a/docs/reference/tmpl/xfconf-errors.sgml b/docs/reference/tmpl/xfconf-errors.sgml index cccf7a2..110b5f8 100644 --- a/docs/reference/tmpl/xfconf-errors.sgml +++ b/docs/reference/tmpl/xfconf-errors.sgml @@ -18,6 +18,9 @@ use of #GErrors. + + + diff --git a/docs/reference/tmpl/xfconf-types.sgml b/docs/reference/tmpl/xfconf-types.sgml index 42ded59..3ef63ca 100644 --- a/docs/reference/tmpl/xfconf-types.sgml +++ b/docs/reference/tmpl/xfconf-types.sgml @@ -19,6 +19,9 @@ these primitive types are provided here. + + + diff --git a/docs/reference/tmpl/xfconf.sgml b/docs/reference/tmpl/xfconf.sgml index c991b63..ed8c5e1 100644 --- a/docs/reference/tmpl/xfconf.sgml +++ b/docs/reference/tmpl/xfconf.sgml @@ -22,6 +22,9 @@ resources. + + + @@ -36,6 +39,7 @@ resources. +@void: -- 1.7.0.4