diff options
| author | Martyn Russell <martyn@lanedo.com> | 2014-02-20 13:15:26 +0000 |
|---|---|---|
| committer | Martyn Russell <martyn@lanedo.com> | 2014-02-20 13:15:26 +0000 |
| commit | 400d22f1a3cabbf8698031f8919f6ea5e312a448 (patch) | |
| tree | 0d89b05a3a5e92195fa3474598df80af4045fa92 | |
| parent | 8eae234f0972e4e67ca94d8f95de2706aa102b48 (diff) | |
| download | tracker-400d22f1a3cabbf8698031f8919f6ea5e312a448.tar.gz | |
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}
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | docs/reference/libtracker-control/Makefile.am | 9 | ||||
| -rw-r--r-- | docs/reference/libtracker-miner/Makefile.am | 7 | ||||
| -rw-r--r-- | docs/reference/libtracker-sparql/Makefile.am | 5 |
4 files changed, 19 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 60280a39e..af04bb274 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 565d6c7e2..f6bc1aab7 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 16372e713..019b52843 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 8ff4af786..80ed37694 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 |