[tracker] docs: Make sure we fix cross referenced library symbols



commit 400d22f1a3cabbf8698031f8919f6ea5e312a448
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Feb 20 13:15:26 2014 +0000

    docs: Make sure we fix cross referenced library symbols
    
    Fixes the warnings about GError and other symbols which are unknown when
    generating the documentation for libtracker-{sparql|miner|control}

 configure.ac                                  |    3 +++
 docs/reference/libtracker-control/Makefile.am |    9 ++++++---
 docs/reference/libtracker-miner/Makefile.am   |    7 ++++++-
 docs/reference/libtracker-sparql/Makefile.am  |    5 ++++-
 4 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 60280a3..af04bb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,9 @@ SQLITE_REQUIRED=3.7.9
 # see http://live.gnome.org/GnomeGoals/AddGObjectIntrospectionSupport
 GOBJECT_INTROSPECTION_CHECK([0.9.5])
 
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+AC_SUBST(GLIB_PREFIX)
+
 # Check for libpng 1.2 or higher
 PKG_CHECK_MODULES(LIBPNG, [libpng >= 1.2])
 AC_SUBST(LIBPNG_CFLAGS)
diff --git a/docs/reference/libtracker-control/Makefile.am b/docs/reference/libtracker-control/Makefile.am
index 565d6c7..f6bc1aa 100644
--- a/docs/reference/libtracker-control/Makefile.am
+++ b/docs/reference/libtracker-control/Makefile.am
@@ -29,12 +29,12 @@ IGNORE_HFILES=
 AM_CPPFLAGS =                                          \
        -DTRACKER_COMPILATION                          \
        -I$(top_srcdir)/src                            \
-       $(LIBTRACKER_MINER_CFLAGS)
+       $(LIBTRACKER_CONTROL_CFLAGS)
 
 GTKDOC_LIBS =                                          \
        $(top_builddir)/src/libtracker-control/libtracker-control- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-common/libtracker-common.la \
-       $(LIBTRACKER_MINER_LIBS)
+       $(LIBTRACKER_CONTROL_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -51,7 +51,10 @@ expand_content_files =
 HTML_IMAGES =
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS = \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index 16372e7..019b528 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -69,7 +69,12 @@ expand_content_files =
 HTML_IMAGES =
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS = \
+       --extra-dir=../libtracker-control/html \
+       --extra-dir=../libtracker-sparql/html \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/docs/reference/libtracker-sparql/Makefile.am b/docs/reference/libtracker-sparql/Makefile.am
index 8ff4af7..80ed376 100644
--- a/docs/reference/libtracker-sparql/Makefile.am
+++ b/docs/reference/libtracker-sparql/Makefile.am
@@ -51,7 +51,10 @@ expand_content_files =
 HTML_IMAGES =
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS =
+FIXXREF_OPTIONS = \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
 
 include $(top_srcdir)/gtk-doc.make
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]