2.0: Bump clutter-1.0 to clutter-2.0

Some places in the build system do not (or cannot) use the macro-ified
CLUTTER_API_VERSION, so we need to fix them up manually.
This commit is contained in:
Emmanuele Bassi
2012-10-07 20:11:43 +01:00
parent 2797740885
commit 29c42bfe8e
12 changed files with 14 additions and 16 deletions

View File

@ -129,7 +129,7 @@ ui_data = \
$(srcdir)/script-ui.json \
$(NULL)
examplesdir = $(datadir)/clutter-1.0/cookbook/examples
examplesdir = $(datadir)/clutter-2.0/cookbook/examples
examples_DATA = $(uidata) $(srcdir)/*.c $(srcdir)/*.h
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore

View File

@ -7,8 +7,6 @@
*
* but when the pointer is over the overlap between red and green,
* signals are emitted by green
*
* gcc -g -O0 -o stacked-actors-and-events stacked-actors-and-events.c `pkg-config --libs --cflags clutter-1.0 glib-2.0` -lm
*/
#include <clutter/clutter.h>

View File

@ -84,7 +84,7 @@
<title>Compiling the examples</title>
<para>This document comes with full examples, usually stored
on disk in <filename><emphasis>datadir</emphasis>/clutter-1.0/cookbook/examples</filename>
on disk in <filename><emphasis>datadir</emphasis>/clutter-2.0/cookbook/examples</filename>
directory.</para>
<para>Each example can be compiled using:</para>
@ -92,9 +92,9 @@
<informalexample>
<programlisting>
cc \
`pkg-config --cflags clutter-1.0` \
`pkg-config --cflags clutter-2.0` \
-o <emphasis>example</emphasis> <emphasis>example</emphasis>.c \
`pkg-config --libs clutter-1.0`
`pkg-config --libs clutter-2.0`
</programlisting>
</informalexample>