GNOME.org
 

gir-repository r42 - in trunk: . gir

Author: walters
Date: Wed Aug 20 19:20:09 2008
New Revision: 42
URL: http://svn.gnome.org/viewvc/gir-repository?rev=42&view=rev

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

	* gir/*.gir: Don't include in SVN; the parser
	is still changing.  Switch to using GI
	namespace instead of pkg-config name for .gir.
	Build and install typelibs.



Removed:
   trunk/gir/atk.gir
   trunk/gir/gdk-pixbuf-2.0.gir
   trunk/gir/gdk-x11-2.0.gir
   trunk/gir/gtk-x11-2.0.gir
   trunk/gir/pango.gir
   trunk/gir/pangocairo.gir
   trunk/gir/pangoft2.gir
   trunk/gir/pangox.gir
   trunk/gir/pangoxft.gir
Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Aug 20 19:20:09 2008
@@ -4,10 +4,10 @@
 # pango
 PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
 PANGO_LIBDIR=`pkg-config --variable=libdir pango`
-pango.gir:
+Pango.gir:
 	$(G_IR_SCANNER) -v --namespace Pango \
-            --include=$(GIRDIR)/glib-2.0.gir \
-            --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(GIRDIR)/GLib.gir \
+            --include=$(GIRDIR)/GObject.gir \
             --library=$(PANGO_LIBDIR)/libpango-1.0.so.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -17,16 +17,16 @@
             --pkg freetype2 \
             -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pango-*.h
-BUILT_GIRSOURCES += pango.gir
+BUILT_GIRSOURCES += Pango.gir
 
 PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
-pangoft2.gir: fontconfig.gir freetype2.gir pango.gir
+PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir
 	$(G_IR_SCANNER) -v --namespace PangoFT2 \
-            --include=$(GIRDIR)/glib-2.0.gir \
-            --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(GIRDIR)/GLib.gir \
+            --include=$(GIRDIR)/GObject.gir \
             --include=$(srcdir)/fontconfig.gir \
             --include=$(srcdir)/freetype2.gir \
-            --include=$(srcdir)/pango.gir \
+            --include=$(srcdir)/Pango.gir \
             --library=$(PANGOFT2_LIBDIR)/libpangoft2-1.0.so.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -36,15 +36,15 @@
             -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangoft2.h \
             $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
-BUILT_GIRSOURCES += pangoft2.gir
+BUILT_GIRSOURCES += PangoFT2.gir
 
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
-pangocairo.gir: cairo.gir pango.gir
+PangoCairo.gir: cairo.gir Pango.gir
 	$(G_IR_SCANNER) -v --namespace PangoCairo \
-            --include=$(GIRDIR)/glib-2.0.gir \
-            --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(GIRDIR)/GLib.gir \
+            --include=$(GIRDIR)/GObject.gir \
             --include=$(srcdir)/cairo.gir \
-            --include=$(srcdir)/pango.gir \
+            --include=$(srcdir)/Pango.gir \
             --library=$(PANGOCAIRO_LIBDIR)/libpangocairo-1.0.so.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -53,18 +53,18 @@
             --pkg pangocairo \
             -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangocairo.h
-BUILT_GIRSOURCES += pangocairo.gir
+BUILT_GIRSOURCES += PangoCairo.gir
 
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
-pangoxft.gir: fontconfig.gir xft.gir xlib.gir pango.gir pangoft2.gir
+PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir
 	$(G_IR_SCANNER) -v --namespace PangoXft \
-            --include=$(GIRDIR)/glib-2.0.gir \
-            --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(GIRDIR)/GLib.gir \
+            --include=$(GIRDIR)/GObject.gir \
             --include=$(srcdir)/fontconfig.gir \
             --include=$(srcdir)/xft.gir \
             --include=$(srcdir)/xlib.gir \
-            --include=$(srcdir)/pango.gir \
-            --include=$(srcdir)/pangoft2.gir \
+            --include=$(srcdir)/Pango.gir \
+            --include=$(srcdir)/PangoFT2.gir \
             --library=$(PANGOXFT_LIBDIR)/libpangoxft-1.0.so.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -74,15 +74,15 @@
             -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangoxft.h \
             $(PANGO_INCLUDEDIR)/pango/pangoxft-render.h
-BUILT_GIRSOURCES += pangoxft.gir
+BUILT_GIRSOURCES += PangoXft.gir
 
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
-pangox.gir: xlib.gir pango.gir
+PangoX.gir: xlib.gir Pango.gir
 	$(G_IR_SCANNER) -v --namespace PangoX \
-            --include=$(GIRDIR)/glib-2.0.gir \
-            --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(GIRDIR)/GLib.gir \
+            --include=$(GIRDIR)/GObject.gir \
             --include=$(srcdir)/xlib.gir \
-            --include=$(srcdir)/pango.gir \
+            --include=$(srcdir)/Pango.gir \
             --library=$(PANGOX_LIBDIR)/libpangox-1.0.so.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -91,48 +91,48 @@
             --pkg pangox \
             -I$(PANGO_INCLUDEDIR) \
             $(PANGO_INCLUDEDIR)/pango/pangox.h
-BUILT_GIRSOURCES += pangox.gir
+BUILT_GIRSOURCES += PangoX.gir
 
 # atk
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
-atk.gir:
+Atk.gir:
 	$(G_IR_SCANNER) -v --namespace Atk \
-             --include=$(GIRDIR)/glib-2.0.gir \
-             --include=$(GIRDIR)/gobject-2.0.gir \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
 	     --library=$(ATK_LIBDIR)/libatk-1.0.so.0 \
 	     $(NOCLOSURE) \
              --output $@ \
              --pkg gobject-2.0 \
              -I$(ATK_INCLUDEDIR) \
              $(ATK_INCLUDEDIR)/atk/*.h
-BUILT_GIRSOURCES += atk.gir
+BUILT_GIRSOURCES += Atk.gir
 
 # gdk
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
 GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
-gdk-pixbuf-2.0.gir:
+GdkPixbuf.gir:
 	$(G_IR_SCANNER) -v --namespace GdkPixbuf --strip-prefix=Gdk \
-             --include=$(GIRDIR)/glib-2.0.gir \
-             --include=$(GIRDIR)/gobject-2.0.gir \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
 	     --library=$(GDKPIXBUF_LIBDIR)/libgdk_pixbuf-2.0.so.0 \
 	     $(NOCLOSURE) \
              --output $@ \
              --pkg gobject-2.0 \
              -I$(GDKPIXBUF_INCLUDEDIR) \
              $(GDKPIXBUF_INCLUDEDIR)/gdk-pixbuf/*.h
-BUILT_GIRSOURCES += gdk-pixbuf-2.0.gir
+BUILT_GIRSOURCES += GdkPixbuf.gir
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
-gdk-x11-2.0.gir: cairo.gir pango.gir xlib.gir gdk-pixbuf-2.0.gir
+Gdk.gir: cairo.gir Pango.gir xlib.gir GdkPixbuf.gir
 	$(G_IR_SCANNER) -v --namespace Gdk \
-             --include=$(GIRDIR)/glib-2.0.gir \
-             --include=$(GIRDIR)/gobject-2.0.gir \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
              --include=$(srcdir)/cairo.gir \
-             --include=$(srcdir)/pango.gir \
+             --include=$(srcdir)/Pango.gir \
              --include=$(srcdir)/xlib.gir \
-             --include=$(srcdir)/gdk-pixbuf-2.0.gir \
+             --include=$(srcdir)/GdkPixbuf.gir \
 	     --library=$(GDK_LIBDIR)/libgdk-x11-2.0.so.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -144,20 +144,20 @@
              -I$(GDK_INCLUDEDIR) \
 	     $(srcdir)/gdk-x11-2.0.c \
              $(GDK_INCLUDEDIR)/gdk/*.h
-BUILT_GIRSOURCES += gdk-x11-2.0.gir
+BUILT_GIRSOURCES += Gdk.gir
 
 # gtk
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-2.0`/gtk-2.0
 GTK_LIBDIR=`pkg-config --variable=libdir gtk+-2.0`
-gtk-x11-2.0.gir: cairo.gir pango.gir atk.gir xlib.gir gdk-pixbuf-2.0.gir gdk-x11-2.0.gir
+Gtk.gir: cairo.gir Pango.gir Atk.gir xlib.gir GdkPixbuf.gir Gdk.gir
 	$(G_IR_SCANNER) -v --namespace Gtk \
-             --include=$(GIRDIR)/glib-2.0.gir \
-             --include=$(GIRDIR)/gobject-2.0.gir \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
              --include=$(srcdir)/cairo.gir \
-             --include=$(srcdir)/pango.gir \
-             --include=$(srcdir)/atk.gir \
-             --include=$(srcdir)/gdk-pixbuf-2.0.gir \
-             --include=$(srcdir)/gdk-x11-2.0.gir \
+             --include=$(srcdir)/Pango.gir \
+             --include=$(srcdir)/Atk.gir \
+             --include=$(srcdir)/GdkPixbuf.gir \
+             --include=$(srcdir)/Gdk.gir \
 	     --library=$(GTK_LIBDIR)/libgtk-x11-2.0.so.0 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -173,11 +173,14 @@
 	     -I$(GTK_INCLUDEDIR) \
 	     $(srcdir)/gtk-x11-2.0.c \
              $(GTK_INCLUDEDIR)/gtk/*.h
-BUILT_GIRSOURCES += gtk-x11-2.0.gir
+BUILT_GIRSOURCES += Gtk.gir
 
 girdir = $(datadir)/gir
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)
 
+typelibsdir = $(datadir)/gitypelibs
+typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
+
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
@@ -186,8 +189,3 @@
 
 %.typelib.gdb: %.gir
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< --raw -o $@
-
-regenerate: clean-gir $(BUILT_GIRSOURCES)
-
-regenerate-noclosure:
-	$(MAKE) regenerate NOCLOSURE=--noclosure
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]