From 683642ba545acaf78b13de3d5ffe07705dec348a Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 3 Nov 2011 16:05:36 +0000 Subject: [PATCH] docs: Fixes for the API reference build --- clutter/clutter-layout-manager.c | 1 - doc/reference/clutter/Makefile.am | 25 +++++++++++++++-------- doc/reference/clutter/running-clutter.xml | 1 + 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/clutter/clutter-layout-manager.c b/clutter/clutter-layout-manager.c index 70bcecc7b..3bb196a0c 100644 --- a/clutter/clutter-layout-manager.c +++ b/clutter/clutter-layout-manager.c @@ -321,7 +321,6 @@ * ] * } * - * * * * #ClutterLayoutManager is available since Clutter 1.2 diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am index 901ac5940..3a83b62ec 100644 --- a/doc/reference/clutter/Makefile.am +++ b/doc/reference/clutter/Makefile.am @@ -52,16 +52,19 @@ HFILE_GLOB=\ $(top_builddir)/clutter/*.h \ $(top_srcdir)/clutter/x11/clutter-x11.h \ $(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \ - $(top_srcdir)/clutter/cogl/clutter-glx-texture-pixmap.h \ - $(top_srcdir)/clutter/cogl/clutter-egl.h \ - $(top_srcdir)/clutter/cogl/clutter-cex100.h \ - $(top_srcdir)/clutter/win32/clutter-win32.h + $(top_srcdir)/clutter/x11/clutter-glx-texture-pixmap.h \ + $(top_srcdir)/clutter/egl/clutter-egl.h \ + $(top_srcdir)/clutter/egl/clutter-cex100.h \ + $(top_srcdir)/clutter/win32/clutter-win32.h \ + $(top_srcdir)/clutter/gdk/clutter-gdk.h CFILE_GLOB=\ $(top_srcdir)/clutter/*.c \ $(top_srcdir)/clutter/cogl/*.c \ $(top_srcdir)/clutter/x11/*.c \ - $(top_srcdir)/clutter/win32/*.c + $(top_srcdir)/clutter/win32/*.c \ + $(top_srcdir)/clutter/gdk/*.c \ + $(top_srcdir)/clutter/egl/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h @@ -96,8 +99,11 @@ IGNORE_HFILES=\ clutter-timeout-interval.h \ cally \ cogl \ + egl \ evdev \ + gdk \ osx \ + tslib \ x11 \ wayland \ win32 @@ -105,11 +111,12 @@ IGNORE_HFILES=\ EXTRA_HFILES=\ $(top_srcdir)/clutter/x11/clutter-x11.h \ $(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \ - $(top_srcdir)/clutter/cogl/clutter-glx-texture-pixmap.h \ - $(top_srcdir)/clutter/cogl/clutter-egl.h \ - $(top_srcdir)/clutter/cogl/clutter-cex100.h \ + $(top_srcdir)/clutter/x11/clutter-glx-texture-pixmap.h \ + $(top_srcdir)/clutter/egl/clutter-egl.h \ + $(top_srcdir)/clutter/egl/clutter-cex100.h \ $(top_srcdir)/clutter/wayland/clutter-wayland.h \ - $(top_srcdir)/clutter/win32/clutter-win32.h + $(top_srcdir)/clutter/win32/clutter-win32.h \ + $(top_srcdir)/clutter/gdk/clutter-gdk.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/doc/reference/clutter/running-clutter.xml b/doc/reference/clutter/running-clutter.xml index 73b1d34bf..371edcd24 100644 --- a/doc/reference/clutter/running-clutter.xml +++ b/doc/reference/clutter/running-clutter.xml @@ -203,6 +203,7 @@ Backend-related notes, including initialization of the backend features and GL context creation + event Event handling notes