gir-repository r105 - in trunk: . gir

[lucasr svn gnome org]

Author: lucasr
Date: Fri Oct  3 07:45:23 2008
New Revision: 105
URL: http://svn.gnome.org/viewvc/gir-repository?rev=105&view=rev

Log:
2008-10-03  Lucas Rocha  <lucasr gnome org>

	* configure.ac, gir/Makefile.am: update build to use Clutter 0.8.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Oct  3 07:45:23 2008
@@ -77,17 +77,17 @@
 AM_CONDITIONAL(BUILD_NOTIFY, $have_notify)
 
 dnl clutter
-PKG_CHECK_MODULES(CLUTTER, clutter-0.6 >= 0.6,
+PKG_CHECK_MODULES(CLUTTER, clutter-0.8 >= 0.8,
                   have_clutter=true, have_clutter=false)
 AM_CONDITIONAL(BUILD_CLUTTER, $have_clutter)
 
 dnl clutter-gtk
-PKG_CHECK_MODULES(CLUTTERGTK, clutter-gtk-0.6 >= 0.6, 
+PKG_CHECK_MODULES(CLUTTERGTK, clutter-gtk-0.8 >= 0.8,
                   have_clutter_gtk=true, have_clutter_gtk=false)
 AM_CONDITIONAL(BUILD_CLUTTERGTK, $have_clutter_gtk)
 
 dnl clutter-cairo
-PKG_CHECK_MODULES(CLUTTERCAIRO, clutter-cairo-0.6 >= 0.6, 
+PKG_CHECK_MODULES(CLUTTERCAIRO, clutter-cairo-0.8 >= 0.8,
                   have_clutter_cairo=true, have_clutter_cairo=false)
 AM_CONDITIONAL(BUILD_CLUTTERCAIRO, $have_clutter_cairo)
 

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Fri Oct  3 07:45:23 2008
@@ -331,77 +331,74 @@
 
 # clutter
 if BUILD_CLUTTER
-CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-0.6`
-CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.6`
+CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-0.8`
+CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.8`
 ClutterJson.gir: $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace ClutterJson \
              --include=GObject.gir \
-	     --library=clutter-glx-0.6 \
+	     --library=clutter-glx-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
-             --pkg clutter-0.6 \
+             --pkg clutter-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
-             $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter/json/*.h
+             $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
 
-Clutter.gir: Pango.gir $(srcdir)/PangoFT2.gir $(G_IR_SCANNER) 
-Clutter.gir: ClutterJson.gir GdkPixbuf.gir
+Clutter.gir: ClutterJson.gir GdkPixbuf.gir Pango.gir PangoCairo.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Clutter \
              --include=$(srcdir)/GL.gir \
              --include=GObject.gir \
              --include=$(srcdir)/xlib.gir \
              --include=Pango.gir \
-             --include=PangoFT2.gir \
+             --include=PangoCairo.gir \
              --include=GdkPixbuf.gir \
              --include=ClutterJson.gir \
-	     --library=clutter-glx-0.6 \
+	     --library=clutter-glx-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
-             --pkg clutter-0.6 \
+             --pkg clutter-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
-             $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter/*.h
+             $(CLUTTER_INCLUDEDIR)/clutter-0.8/cogl/*.h \
+	     $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/*.h
 BUILT_GIRSOURCES += Clutter.gir ClutterJson.gir
 endif BUILD_CLUTTER
 
 if BUILD_CLUTTERGTK
-CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.6`
-CLUTTERGTK_LIBDIR=`pkg-config --variable=libdir clutter-gtk-0.6`
-ClutterGtk.gir: Clutter.gir $(G_IR_SCANNER) 
-ClutterGtk.gir: Gtk.gir
+CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.8`
+CLUTTERGTK_LIBDIR=`pkg-config --variable=libdir clutter-gtk-0.8`
+ClutterGtk.gir: Clutter.gir Gtk.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterGtk \
              --include=$(srcdir)/GL.gir \
              --include=GObject.gir \
              --include=Gtk.gir \
              --include=Clutter.gir \
-	     --library=clutter-gtk-0.6 \
+	     --library=clutter-gtk-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
              --pkg gtk+-2.0 \
-             --pkg clutter-0.6 \
+             --pkg clutter-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
-             $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter-gtk/*.h
+             $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h
 BUILT_GIRSOURCES += ClutterGtk.gir
 endif BUILD_CLUTTERGTK
 
 if BUILD_CLUTTERCAIRO
-CLUTTERCAIRO_INCLUDEDIR=`pkg-config --variable=includedir clutter-cairo-0.6`
-CLUTTERCAIRO_LIBDIR=`pkg-config --variable=libdir clutter-cairo-0.6`
-ClutterCairo.gir: Clutter.gir $(G_IR_SCANNER) 
-ClutterCairo.gir: Gtk.gir
+CLUTTERCAIRO_INCLUDEDIR=`pkg-config --variable=includedir clutter-cairo-0.8`
+CLUTTERCAIRO_LIBDIR=`pkg-config --variable=libdir clutter-cairo-0.8`
+ClutterCairo.gir: Clutter.gir cairo.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterCairo \
-             --include=Gtk.gir \
+             --include=cairo.gir \
              --include=Clutter.gir \
-	     --library=clutter-gtk-0.6 \
+	     --library=clutter-gtk-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
-             --pkg gtk+-2.0 \
              --pkg cairo \
-             --pkg clutter-cairo-0.6 \
+             --pkg clutter-cairo-0.8 \
              --output $@ \
 	     -I$(CLUTTERCAIRO_INCLUDEDIR) \
-             $(CLUTTERCAIRO_INCLUDEDIR)/clutter-0.6/clutter-cairo/*.h
+             $(CLUTTERCAIRO_INCLUDEDIR)/clutter-0.8/clutter-cairo/*.h
 BUILT_GIRSOURCES += ClutterCairo.gir
 endif BUILD_CLUTTERCAIRO