brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Update the API reference build

Browse Source 
Add the Cogl prefix to the fix-cross-references script options, and
update the location of the extra headers.
This commit is contained in:
Emmanuele Bassi 2011-06-20 13:56:46 +01:00
parent d5ea422c8f
commit 3861a1c3ba
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -305,7 +305,7 @@ AS_CASE([$CLUTTER_FLAVOUR],
# Make sure we don't enable tslib and evdev at the same time, we # Make sure we don't enable tslib and evdev at the same time, we
# don't support multiple event backends yet. # don't support multiple event backends yet.
AS_IF([test "x$have_tslib" = "xyes" -a "x$have_evdev" = "xyes"], AS_IF([test "x$have_tslib" = "xyes" -a "x$have_evdev" = "xyes"],
[AC_MSG_ERROR([Can't enable both tslib and evdev events])]) [AC_MSG_ERROR([Cannot enable both tslib and evdev events])])
FLAVOUR_LIBS="$FLAVOUR_LIBS $TSLIB_LIBS $EVDEV_LIBS" FLAVOUR_LIBS="$FLAVOUR_LIBS $TSLIB_LIBS $EVDEV_LIBS"
FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS $TSLIB_CFLAGS $EVDEV_CFLAGS" FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS $TSLIB_CFLAGS $EVDEV_CFLAGS"
@ -436,8 +436,7 @@ dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter
dnl and cogl code we use a define in config.h instead. This helps ensure dnl and cogl code we use a define in config.h instead. This helps ensure
dnl other tools such as glib-mkenums and gir-scanner don't end up dnl other tools such as glib-mkenums and gir-scanner don't end up
dnl using the define also. dnl using the define also.
AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1], AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1], [Can use Cogl 2.0 API internally])
[Can use Cogl 2.0 API internally])
dnl === Clutter configuration ================================================= dnl === Clutter configuration =================================================
@ -874,10 +873,12 @@ AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes" || test ! -f "
CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`" CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
COGL_PREFIX="`$PKG_CONFIG --variable=prefix cogl-1.0`"
ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
AC_SUBST(CAIRO_PREFIX) AC_SUBST(CAIRO_PREFIX)
AC_SUBST(GLIB_PREFIX) AC_SUBST(GLIB_PREFIX)
AC_SUBST(PANGO_PREFIX) AC_SUBST(PANGO_PREFIX)
AC_SUBST(COGL_PREFIX)
AC_SUBST(ATK_PREFIX) AC_SUBST(ATK_PREFIX)
dnl === Manual ================================================================ dnl === Manual ================================================================

29
doc/reference/clutter/Makefile.am
View File

@ -42,24 +42,27 @@ FIXXREF_OPTIONS=\
--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo \ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo \
--extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango --extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
--extra-dir=$(COGL_PREFIX)/share/gtk-doc/html/cogl
# 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=$(top_srcdir)/clutter/*.h \ HFILE_GLOB=\
$(top_srcdir)/clutter/*.h \
$(top_builddir)/clutter/*.h \ $(top_builddir)/clutter/*.h \
$(top_srcdir)/clutter/x11/clutter-x11.h \ $(top_srcdir)/clutter/x11/clutter-x11.h \
$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \ $(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
$(top_srcdir)/clutter/glx/clutter-glx-texture-pixmap.h \ $(top_srcdir)/clutter/cogl/clutter-glx-texture-pixmap.h \
$(top_srcdir)/clutter/egl/clutter-egl.h \ $(top_srcdir)/clutter/cogl/clutter-egl.h \
$(top_srcdir)/clutter/egl/clutter-cex100.h \ $(top_srcdir)/clutter/cogl/clutter-cex100.h \
$(top_srcdir)/clutter/win32/clutter-win32.h $(top_srcdir)/clutter/win32/clutter-win32.h
CFILE_GLOB=$(top_srcdir)/clutter/*.c \
CFILE_GLOB=\
$(top_srcdir)/clutter/*.c \
$(top_srcdir)/clutter/cogl/*.c \
$(top_srcdir)/clutter/x11/*.c \ $(top_srcdir)/clutter/x11/*.c \
$(top_srcdir)/clutter/glx/*.c \ $(top_srcdir)/clutter/win32/*.c
$(top_srcdir)/clutter/win32/*.c \
$(top_srcdir)/clutter/egl/*.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
@ -94,9 +97,7 @@ IGNORE_HFILES=\
clutter-timeout-interval.h \ clutter-timeout-interval.h \
cally \ cally \
cogl \ cogl \
egl \
evdev \ evdev \
glx \
osx \ osx \
x11 \ x11 \
wayland \ wayland \
@ -105,9 +106,9 @@ IGNORE_HFILES=\
EXTRA_HFILES=\ EXTRA_HFILES=\
$(top_srcdir)/clutter/x11/clutter-x11.h \ $(top_srcdir)/clutter/x11/clutter-x11.h \
$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \ $(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
$(top_srcdir)/clutter/glx/clutter-glx-texture-pixmap.h \ $(top_srcdir)/clutter/cogl/clutter-glx-texture-pixmap.h \
$(top_srcdir)/clutter/egl/clutter-egl.h \ $(top_srcdir)/clutter/cogl/clutter-egl.h \
$(top_srcdir)/clutter/egl/clutter-cex100.h \ $(top_srcdir)/clutter/cogl/clutter-cex100.h \
$(top_srcdir)/clutter/wayland/clutter-wayland.h \ $(top_srcdir)/clutter/wayland/clutter-wayland.h \
$(top_srcdir)/clutter/win32/clutter-win32.h $(top_srcdir)/clutter/win32/clutter-win32.h