From 6fbe92193f85307ba1f0a473c8f242d07bb1f90d Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed, 30 Jun 2010 15:50:47 +0100
Subject: [PATCH] docs: Various fixes for gtk-doc

---
 cogl/cogl.h                    | 10 +++++-----
 doc/reference/cogl/Makefile.am | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cogl/cogl.h b/cogl/cogl.h
index 791e1ad5f..64eac5b83 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -258,10 +258,10 @@ cogl_frustum (float left,
  * @right: The coordinate for the right clipping plane
  * @bottom: The coordinate for the bottom clipping plane
  * @top: The coordinate for the top clipping plane
- * @near: The <b>distance</b> to the near clipping plane (negative if
- *        the plane is behind the viewer)
- * @far: The <b>distance</b> for the far clipping plane (negative if
- *       the plane is behind the viewer)
+ * @near: The <emphasis>distance</emphasis> to the near clipping
+ *   plane (negative if the plane is behind the viewer)
+ * @far: The <emphasis>distance</emphasis> for the far clipping
+ *   plane (negative if the plane is behind the viewer)
  *
  * Replaces the current projection matrix with an orthographic projection
  * matrix. See <xref linkend="cogl-ortho-matrix"/> to see how the matrix is
@@ -272,7 +272,7 @@ cogl_frustum (float left,
  *   <graphic fileref="cogl_ortho.png" format="PNG"/>
  * </figure>
  *
- * <note>cogl_ortho copies the arguments from OpenGL's glOrtho even
+ * <note>This function copies the arguments from OpenGL's glOrtho() even
  * though they are unnecessarily confusing due to the z near and z far
  * arguments actually being a "distance" from the origin, where
  * negative values are behind the viewer, instead of coordinates for
diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am
index 3ea046337..8ca7830d9 100644
--- a/doc/reference/cogl/Makefile.am
+++ b/doc/reference/cogl/Makefile.am
@@ -39,16 +39,15 @@ 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=$(top_srcdir)/doc/reference/clutter/html
+	--extra-dir=$(GDPIXBUF_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
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB=\
-	$(top_srcdir)/clutter/cogl/cogl/*.h
-CFILE_GLOB=\
-	$(top_srcdir)/clutter/cogl/cogl/*.c
+	$(top_srcdir)/clutter/cogl/cogl/*.h \
+	$(top_builddir)/clutter/cogl/cogl/*.h
+CFILE_GLOB=$(top_srcdir)/clutter/cogl/cogl/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -85,6 +84,7 @@ IGNORE_HFILES=\
 	cogl-util.h 				\
 	cogl-vertex-buffer-private.h 		\
 	driver 					\
+	tesselator				\
 	winsys
 
 EXTRA_HFILES=
@@ -113,7 +113,7 @@ expand_content_files = \
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
-INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_srcdir)/clutter/cogl $(CLUTTER_CFLAGS)
+INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_srcdir)/clutter/cogl -I$(top_builddir)/clutter/cogl $(CLUTTER_CFLAGS)
 GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.