[Cogl] [PATCH 48/53] doc: Fix cross-referencing with glib and gdk-pixbuf

Damien Lespiau damien.lespiau at gmail.com
Tue Jan 1 06:31:24 PST 2013


From: Damien Lespiau <damien.lespiau at intel.com>

The libraries prefixes where never set in the configure script and
GDKPIXBUF_PREFIX had a typo.
---
 configure.ac                    |    5 +++++
 doc/reference/cogl2/Makefile.am |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index e247bcb..4e19a62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1076,6 +1076,11 @@ GTK_DOC_CHECK([gtk_doc_req_version], [--flavour no-tmpl])
 ])
 AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"])
 
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+GDKPIXBUF_PREFIX="`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`"
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(GDKPIXBUF_PREFIX)
+
 dnl ================================================================
 dnl I18n stuff.
 dnl ================================================================
diff --git a/doc/reference/cogl2/Makefile.am b/doc/reference/cogl2/Makefile.am
index e9c5751..e9e46c9 100644
--- a/doc/reference/cogl2/Makefile.am
+++ b/doc/reference/cogl2/Makefile.am
@@ -39,7 +39,7 @@ MKTMPL_OPTIONS=
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=\
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-	--extra-dir=$(GDPIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf
+	--extra-dir=$(GDKPIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-- 
1.7.7.5



More information about the Cogl mailing list