gir-repository r95 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Sun Sep 14 21:36:47 2008
New Revision: 95
URL: http://svn.gnome.org/viewvc/gir-repository?rev=95&view=rev

Log:
Bind GtkSourceView and VTE; don't use $(srcdir) for built files


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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Sep 14 21:36:47 2008
@@ -91,6 +91,16 @@
                   have_gstreamer=true, have_gstreamer=false)
 AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer)
 
+dnl gtksourceview
+PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0,
+                  have_gtksourceview=true, have_gtksourceview=false)
+AM_CONDITIONAL(BUILD_GTKSOURCEVIEW, $have_gtksourceview)
+
+dnl vte
+PKG_CHECK_MODULES(VTE, vte,
+                  have_vte=true, have_vte=false)
+AM_CONDITIONAL(BUILD_VTE, $have_vte)
+
 dnl goocanvas
 PKG_CHECK_MODULES(GOOCANVAS, goocanvas,
                   have_goocanvas=true, have_goocanvas=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Sun Sep 14 21:36:47 2008
@@ -86,7 +86,7 @@
 PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace PangoFT2 \
             --include=GObject.gir \
-            --include=$(srcdir)/Pango.gir \
+            --include=Pango.gir \
             --include=$(srcdir)/freetype2.gir \
             --include=$(srcdir)/fontconfig.gir \
             --library=pangoft2-1.0 \
@@ -104,7 +104,7 @@
 PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace PangoCairo \
             --include=GObject.gir \
-            --include=$(srcdir)/Pango.gir \
+            --include=Pango.gir \
             --include=$(srcdir)/cairo.gir \
             --library=pangocairo-1.0 \
 	    $(NOCLOSURE) \
@@ -139,7 +139,7 @@
 	$(G_IR_SCANNER) -v --namespace PangoX \
             --include=GObject.gir \
             --include=$(srcdir)/xlib.gir \
-            --include=$(srcdir)/Pango.gir \
+            --include=Pango.gir \
             --library=pangox-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -190,9 +190,9 @@
 	$(G_IR_SCANNER) -v --namespace Gdk \
              --include=Gio.gir \
              --include=$(srcdir)/cairo.gir \
-             --include=$(srcdir)/Pango.gir \
+             --include=Pango.gir \
              --include=$(srcdir)/xlib.gir \
-             --include=$(srcdir)/GdkPixbuf.gir \
+             --include=GdkPixbuf.gir \
 	     --library=gdk-x11-2.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -214,10 +214,10 @@
 	$(G_IR_SCANNER) -v --namespace Gtk \
              --include=Gio.gir \
              --include=$(srcdir)/cairo.gir \
-             --include=$(srcdir)/Pango.gir \
-             --include=$(srcdir)/Atk.gir \
-             --include=$(srcdir)/GdkPixbuf.gir \
-             --include=$(srcdir)/Gdk.gir \
+             --include=Pango.gir \
+             --include=Atk.gir \
+             --include=GdkPixbuf.gir \
+             --include=Gdk.gir \
 	     --library=gtk-x11-2.0 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -245,8 +245,8 @@
 WebKit.gir: JSCore.gir Gtk.gir $(G_IR_SCANNER) 
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit \
              --include=GObject.gir \
-             --include=$(srcdir)/Gtk.gir \
-             --include=$(srcdir)/JSCore.gir \
+             --include=Gtk.gir \
+             --include=JSCore.gir \
 	     --library=webkit-1.0 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -276,6 +276,38 @@
 BUILT_GIRSOURCES += Notify.gir
 endif
 
+# gtksourceview
+if BUILD_GTKSOURCEVIEW
+GTKSOURCEVIEW_INCLUDEDIR=`pkg-config --variable=includedir gtksourceview-2.0`/gtksourceview-2.0
+GTKSOURCEVIEW_LIBDIR=`pkg-config --variable=libdir gtksourceview-2.0`
+GtkSource.gir: $(G_IR_SCANNER) Gtk.gir
+	$(G_IR_SCANNER) -v --namespace GtkSource \
+             --include=Gtk.gir \
+	     --library=gtksourceview-2.0 \
+	     $(NOCLOSURE) \
+             --pkg gtk+-2.0 \
+             --output $@ \
+	     -I$(GTKSOURCEVIEW_INCLUDEDIR) \
+             $(GTKSOURCEVIEW_INCLUDEDIR)/gtksourceview/*.h
+BUILT_GIRSOURCES += GtkSource.gir
+endif
+
+# vte
+if BUILD_VTE
+VTE_INCLUDEDIR=`pkg-config --variable=includedir vte`
+VTE_LIBDIR=`pkg-config --variable=libdir vte`
+Vte.gir: $(G_IR_SCANNER) Gtk.gir
+	$(G_IR_SCANNER) -v --namespace Vte \
+             --include=Gtk.gir \
+	     --library=vte \
+	     $(NOCLOSURE) \
+             --pkg gtk+-2.0 \
+             --output $@ \
+	     -I$(VTE_INCLUDEDIR) \
+             $(VTE_INCLUDEDIR)/vte/*.h
+BUILT_GIRSOURCES += Vte.gir
+endif
+
 # clutter
 if BUILD_CLUTTER
 CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-0.6`
@@ -291,16 +323,16 @@
 	     -I$(CLUTTER_INCLUDEDIR) \
              $(CLUTTER_INCLUDEDIR)/clutter-0.6/clutter/json/*.h
 
-Clutter.gir: $(srcdir)/Pango.gir $(srcdir)/PangoFT2.gir $(G_IR_SCANNER) 
-Clutter.gir: $(srcdir)/ClutterJson.gir $(srcdir)/GdkPixbuf.gir
+Clutter.gir: Pango.gir $(srcdir)/PangoFT2.gir $(G_IR_SCANNER) 
+Clutter.gir: ClutterJson.gir GdkPixbuf.gir
 	$(G_IR_SCANNER) -v --namespace Clutter \
              --include=$(srcdir)/GL.gir \
              --include=GObject.gir \
              --include=$(srcdir)/xlib.gir \
-             --include=$(srcdir)/Pango.gir \
-             --include=$(srcdir)/PangoFT2.gir \
-             --include=$(srcdir)/GdkPixbuf.gir \
-             --include=$(srcdir)/ClutterJson.gir \
+             --include=Pango.gir \
+             --include=PangoFT2.gir \
+             --include=GdkPixbuf.gir \
+             --include=ClutterJson.gir \
 	     --library=clutter-glx-0.6 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -314,13 +346,13 @@
 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: $(srcdir)/Clutter.gir $(G_IR_SCANNER) 
-ClutterGtk.gir: $(srcdir)/Gtk.gir
+ClutterGtk.gir: Clutter.gir $(G_IR_SCANNER) 
+ClutterGtk.gir: Gtk.gir
 	$(G_IR_SCANNER) -v --namespace ClutterGtk \
              --include=$(srcdir)/GL.gir \
              --include=GObject.gir \
-             --include=$(srcdir)/Gtk.gir \
-             --include=$(srcdir)/Clutter.gir \
+             --include=Gtk.gir \
+             --include=Clutter.gir \
 	     --library=clutter-gtk-0.6 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -335,11 +367,11 @@
 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: $(srcdir)/Clutter.gir $(G_IR_SCANNER) 
-ClutterCairo.gir: $(srcdir)/Gtk.gir
+ClutterCairo.gir: Clutter.gir $(G_IR_SCANNER) 
+ClutterCairo.gir: Gtk.gir
 	$(G_IR_SCANNER) -v --namespace ClutterCairo \
-             --include=$(srcdir)/Gtk.gir \
-             --include=$(srcdir)/Clutter.gir \
+             --include=Gtk.gir \
+             --include=Clutter.gir \
 	     --library=clutter-gtk-0.6 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -355,10 +387,10 @@
 if BUILD_GOOCANVAS
 GOOCANVAS_INCLUDEDIR=`pkg-config --variable=includedir goocanvas`
 GOOCANVAS_LIBDIR=`pkg-config --variable=libdir goocanvas`
-GooCanvas.gir: $(srcdir)/Gtk.gir $(G_IR_SCANNER) 
+GooCanvas.gir: Gtk.gir $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace GooCanvas \
 	     --strip-prefix=Goo \
-             --include=$(srcdir)/Gtk.gir \
+             --include=Gtk.gir \
 	     --library=goocanvas \
 	     $(NOCLOSURE) \
              --pkg goocanvas \