docs: Various fixes for gtk-doc

This commit is contained in:
Emmanuele Bassi 2010-06-30 15:50:47 +01:00
parent be46b872e9
commit 6fbe92193f
2 changed files with 11 additions and 11 deletions

View File

@ -258,10 +258,10 @@ cogl_frustum (float left,
* @right: The coordinate for the right clipping plane * @right: The coordinate for the right clipping plane
* @bottom: The coordinate for the bottom clipping plane * @bottom: The coordinate for the bottom clipping plane
* @top: The coordinate for the top clipping plane * @top: The coordinate for the top clipping plane
* @near: The <b>distance</b> to the near clipping plane (negative if * @near: The <emphasis>distance</emphasis> to the near clipping
* the plane is behind the viewer) * plane (negative if the plane is behind the viewer)
* @far: The <b>distance</b> for the far clipping plane (negative if * @far: The <emphasis>distance</emphasis> for the far clipping
* the plane is behind the viewer) * plane (negative if the plane is behind the viewer)
* *
* Replaces the current projection matrix with an orthographic projection * Replaces the current projection matrix with an orthographic projection
* matrix. See <xref linkend="cogl-ortho-matrix"/> to see how the matrix is * 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"/> * <graphic fileref="cogl_ortho.png" format="PNG"/>
* </figure> * </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 * though they are unnecessarily confusing due to the z near and z far
* arguments actually being a "distance" from the origin, where * arguments actually being a "distance" from the origin, where
* negative values are behind the viewer, instead of coordinates for * negative values are behind the viewer, instead of coordinates for

View File

@ -39,16 +39,15 @@ MKTMPL_OPTIONS=
# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html # 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=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
--extra-dir=$(GDPIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf \ --extra-dir=$(GDPIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf
--extra-dir=$(top_srcdir)/doc/reference/clutter/html
# Used for dependencies. The docs will be rebuilt if any of these change. # Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
HFILE_GLOB=\ HFILE_GLOB=\
$(top_srcdir)/clutter/cogl/cogl/*.h $(top_srcdir)/clutter/cogl/cogl/*.h \
CFILE_GLOB=\ $(top_builddir)/clutter/cogl/cogl/*.h
$(top_srcdir)/clutter/cogl/cogl/*.c CFILE_GLOB=$(top_srcdir)/clutter/cogl/cogl/*.c
# Header files to ignore when scanning. # Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@ -85,6 +84,7 @@ IGNORE_HFILES=\
cogl-util.h \ cogl-util.h \
cogl-vertex-buffer-private.h \ cogl-vertex-buffer-private.h \
driver \ driver \
tesselator \
winsys winsys
EXTRA_HFILES= EXTRA_HFILES=
@ -113,7 +113,7 @@ expand_content_files = \
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) # 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) 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. # This includes the standard gtk-doc make rules, copied by gtkdocize.