gir-repository r166 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Mon Oct 27 11:29:07 2008
New Revision: 166
URL: http://svn.gnome.org/viewvc/gir-repository?rev=166&view=rev

Log:
Be more consistent about gtk+ and clutter backends

	* configure.ac:
	* gir/Makefile.am: Be more consistent about gtk+ and clutter
	backends (gtk+-2.0 vs. gtk+-x11-2.0) when checking for
	availability and passing library and package names to
	g-ir-scanner

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 27 11:29:07 2008
@@ -72,7 +72,7 @@
 AM_CONDITIONAL(BUILD_POPPLER, $have_poppler)
 
 dnl gtk+
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.12.0,
+PKG_CHECK_MODULES(GTK, gtk+-x11-2.0 >= 1.12.0,
                   have_gtk=true, have_gtk=false)
 AM_CONDITIONAL(BUILD_GTK, $have_gtk)
 
@@ -102,7 +102,7 @@
 AM_CONDITIONAL(BUILD_NOTIFY, $have_notify)
 
 dnl clutter
-PKG_CHECK_MODULES(CLUTTER, clutter-0.8 >= 0.8,
+PKG_CHECK_MODULES(CLUTTER, clutter-glx-0.8 >= 0.8,
                   have_clutter=true, have_clutter=false)
 AM_CONDITIONAL(BUILD_CLUTTER, $have_clutter)
 

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 27 11:29:07 2008
@@ -246,8 +246,8 @@
 	Gdk-custom.c \
 	Gdk-custom.h
 
-GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
-GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
+GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-x11-2.0`/gtk-2.0
+GDK_LIBDIR=`pkg-config --variable=libdir gdk-x11-2.0`
 Gdk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir xlib-2.0.gir GdkPixbuf-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gdk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -264,7 +264,7 @@
              --pkg cairo \
              --pkg atk \
              --pkg pango \
-             --pkg gdk-2.0 \
+             --pkg gdk-x11-2.0 \
              -I$(GDK_INCLUDEDIR) \
 	     $(srcdir)/gdk-x11-2.0.c \
 	     $(srcdir)/Gdk-custom.h \
@@ -287,8 +287,8 @@
 	Gtk-custom.c \
 	Gtk-custom.h
 
-GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-2.0`/gtk-2.0
-GTK_LIBDIR=`pkg-config --variable=libdir gtk+-2.0`
+GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-x11-2.0`/gtk-2.0
+GTK_LIBDIR=`pkg-config --variable=libdir gtk+-x11-2.0`
 Gtk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir Atk-1.0.gir xlib-2.0.gir GdkPixbuf-2.0.gir Gdk-2.0.gir gtk-x11-2.0.c $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gtk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -306,8 +306,8 @@
              --pkg cairo \
              --pkg atk \
              --pkg pango \
-             --pkg gdk-2.0 \
-             --pkg gtk+-2.0 \
+             --pkg gdk-x11-2.0 \
+             --pkg gtk+-x11-2.0 \
              --output $@ \
              -D__GTK_FILE_SYSTEM_H__ \
              -D__GTK_TEXT_LAYOUT_H__ \
@@ -411,8 +411,8 @@
 	Clutter-custom.c \
 	Clutter-custom.h
 
-CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-0.8`
-CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.8`
+CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-glx-0.8`
+CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-glx-0.8`
 ClutterJson-0.8.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
@@ -420,7 +420,7 @@
 	     --library=clutter-glx-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
-             --pkg clutter-0.8 \
+             --pkg clutter-glx-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
@@ -439,7 +439,7 @@
 	     --library=girepo-Clutter-custom \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
-             --pkg clutter-0.8 \
+             --pkg clutter-glx-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
 	     $(srcdir)/clutter-0.8.c \
@@ -466,7 +466,7 @@
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
              --pkg gtk+-2.0 \
-             --pkg clutter-0.8 \
+             --pkg clutter-glx-0.8 \
              --output $@ \
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h