[unique] docs: Fix API reference generation
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [unique] docs: Fix API reference generation
- Date: Tue, 29 Jun 2010 19:43:03 +0000 (UTC)
commit f4cf129782b90056b786ab4d8e6f205ad3548d29
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Jun 29 20:33:58 2010 +0100
docs: Fix API reference generation
configure.ac | 9 ++++++++-
doc/reference/Makefile.am | 7 +++++--
2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b7b3867..521102c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,9 +245,16 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR)
# introspection
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_CHECK([0.9.0])
# gtk-doc
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+GDK_PREFIX="`$PKG_CONFIG --variable=prefix gtk+-3.0`"
+GTK_PREFIX="`$PKG_CONFIG --variable=prefix gdk-3.0`"
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(GDK_PREFIX)
+AC_SUBST(GTK_PREFIX)
+
GTK_DOC_CHECK([1.13])
AC_CONFIG_FILES([
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 2c1dbf4..eb45dfe 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -34,7 +34,10 @@ 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 =
+FIXXREF_OPTIONS = \
+ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+ --extra-dir=$(GDK_PREFIX)/share/gtk-doc/html/gdk \
+ --extra-dir=$(GTK_PREFIX)/share/gtk-doc/html/gtk
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
@@ -75,7 +78,7 @@ expand_content_files =
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
INCLUDES = -I$(top_srcdir) $(UNIQUE_CFLAGS) $(DBUS_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/unique/libunique-1.0.la $(UNIQUE_LIBS) $(DBUS_LIBS)
+GTKDOC_LIBS = $(top_builddir)/unique/libunique-3.0.la $(UNIQUE_LIBS) $(DBUS_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]