gir-repository r36 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Tue Aug 19 23:17:06 2008
New Revision: 36
URL: http://svn.gnome.org/viewvc/gir-repository?rev=36&view=rev

Log:
2008-08-19  Colin Walters  <walters verbum org>

	* gir/Makefile.am: Add regenerate-noclosure target.
	Add --strip-prefix=Gdk to GdkPixbuf.




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

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Aug 19 23:17:06 2008
@@ -9,6 +9,7 @@
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
             --library=$(PANGO_LIBDIR)/libpango-1.0.so.0 \
+	    $(NOCLOSURE) \
             --output $@ \
             --pkg gobject-2.0 \
             --pkg cairo \
@@ -27,6 +28,7 @@
             --include=$(srcdir)/freetype2.gir \
             --include=$(srcdir)/pango.gir \
             --library=$(PANGOFT2_LIBDIR)/libpangoft2-1.0.so.0 \
+	    $(NOCLOSURE) \
             --output $@ \
             --pkg gobject-2.0 \
             --pkg freetype2 \
@@ -44,6 +46,7 @@
             --include=$(srcdir)/cairo.gir \
             --include=$(srcdir)/pango.gir \
             --library=$(PANGOCAIRO_LIBDIR)/libpangocairo-1.0.so.0 \
+	    $(NOCLOSURE) \
             --output $@ \
             --pkg gobject-2.0 \
             --pkg cairo \
@@ -63,6 +66,7 @@
             --include=$(srcdir)/pango.gir \
             --include=$(srcdir)/pangoft2.gir \
             --library=$(PANGOXFT_LIBDIR)/libpangoxft-1.0.so.0 \
+	    $(NOCLOSURE) \
             --output $@ \
             --pkg gobject-2.0 \
             --pkg freetype2 \
@@ -80,6 +84,7 @@
             --include=$(srcdir)/xlib.gir \
             --include=$(srcdir)/pango.gir \
             --library=$(PANGOX_LIBDIR)/libpangox-1.0.so.0 \
+	    $(NOCLOSURE) \
             --output $@ \
             --pkg gobject-2.0 \
             --pkg freetype2 \
@@ -96,6 +101,7 @@
              --include=$(GIRDIR)/glib-2.0.gir \
              --include=$(GIRDIR)/gobject-2.0.gir \
 	     --library=$(ATK_LIBDIR)/libatk-1.0.so.0 \
+	     $(NOCLOSURE) \
              --output $@ \
              --pkg gobject-2.0 \
              -I$(ATK_INCLUDEDIR) \
@@ -105,17 +111,16 @@
 # gdk
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
 GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
-# FIXME: Should use namespace GdkPixbuf, but that breaks the 
 gdk-pixbuf-2.0.gir:
-	$(G_IR_SCANNER) -v --namespace GdkPixbuf \
+	$(G_IR_SCANNER) -v --namespace GdkPixbuf --strip-prefix=Gdk \
              --include=$(GIRDIR)/glib-2.0.gir \
              --include=$(GIRDIR)/gobject-2.0.gir \
 	     --library=$(GDKPIXBUF_LIBDIR)/libgdk_pixbuf-2.0.so.0 \
+	     $(NOCLOSURE) \
              --output $@ \
              --pkg gobject-2.0 \
              -I$(GDKPIXBUF_INCLUDEDIR) \
              $(GDKPIXBUF_INCLUDEDIR)/gdk-pixbuf/*.h
-	sed 's/name="GdkPixbuf"/name="Pixbuf"/' -i $@
 BUILT_GIRSOURCES += gdk-pixbuf-2.0.gir
 
 # TODO:
@@ -144,6 +149,7 @@
              --include=$(srcdir)/xlib.gir \
              --include=$(srcdir)/gdk-pixbuf-2.0.gir \
 	     --library=$(GDK_LIBDIR)/libgdk-x11-2.0.so.0 \
+	     $(NOCLOSURE) \
              --output $@ \
              --pkg gobject-2.0 \
              --pkg cairo \
@@ -168,6 +174,7 @@
              --include=$(srcdir)/gdk-pixbuf-2.0.gir \
              --include=$(srcdir)/gdk-x11-2.0.gir \
 	     --library=$(GTK_LIBDIR)/libgtk-x11-2.0.so.0 \
+	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
              --pkg cairo \
              --pkg atk \
@@ -196,3 +203,6 @@
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< --raw -o $@
 
 regenerate: clean-gir $(BUILT_GIRSOURCES)
+
+regenerate-noclosure:
+	$(MAKE) regenerate NOCLOSURE=--noclosure