gir-repository r62 - in trunk: . gir

From: walters svn gnome org
To: svn-commits-list gnome org
Subject: gir-repository r62 - in trunk: . gir
Date: Sat, 23 Aug 2008 15:26:10 +0000 (UTC)
Author: walters
Date: Sat Aug 23 15:26:10 2008
New Revision: 62
URL: http://svn.gnome.org/viewvc/gir-repository?rev=62&view=rev

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

	* gir/Makefile.am: Adjust to use new scanner
	include handling.




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

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Sat Aug 23 15:26:10 2008
@@ -11,8 +11,7 @@
 PANGO_LIBDIR=`pkg-config --variable=libdir pango`
 Pango.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace Pango \
-            --include=$(GIRDIR)/GLib.gir \
-            --include=$(GIRDIR)/GObject.gir \
+            --include=GObject.gir \
             --library=pango-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -27,11 +26,10 @@
 PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
 PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace PangoFT2 \
-            --include=$(GIRDIR)/GLib.gir \
-            --include=$(GIRDIR)/GObject.gir \
-            --include=$(srcdir)/fontconfig.gir \
-            --include=$(srcdir)/freetype2.gir \
+            --include=GObject.gir \
             --include=$(srcdir)/Pango.gir \
+            --include=$(srcdir)/freetype2.gir \
+            --include=$(srcdir)/fontconfig.gir \
             --library=pangoft2-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -46,10 +44,9 @@
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
 PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace PangoCairo \
-            --include=$(GIRDIR)/GLib.gir \
-            --include=$(GIRDIR)/GObject.gir \
-            --include=$(srcdir)/cairo.gir \
+            --include=GObject.gir \
             --include=$(srcdir)/Pango.gir \
+            --include=$(srcdir)/cairo.gir \
             --library=pangocairo-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -63,12 +60,9 @@
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
 PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace PangoXft \
-            --include=$(GIRDIR)/GLib.gir \
-            --include=$(GIRDIR)/GObject.gir \
-            --include=$(srcdir)/fontconfig.gir \
+            --include=GObject.gir \
             --include=$(srcdir)/xft.gir \
             --include=$(srcdir)/xlib.gir \
-            --include=$(srcdir)/Pango.gir \
             --include=$(srcdir)/PangoFT2.gir \
             --library=pangoxft-1.0 \
 	    $(NOCLOSURE) \
@@ -84,8 +78,7 @@
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
 PangoX.gir: xlib.gir Pango.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace PangoX \
-            --include=$(GIRDIR)/GLib.gir \
-            --include=$(GIRDIR)/GObject.gir \
+            --include=GObject.gir \
             --include=$(srcdir)/xlib.gir \
             --include=$(srcdir)/Pango.gir \
             --library=pangox-1.0 \
@@ -105,8 +98,7 @@
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
 Atk.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace Atk \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
+             --include=GObject.gir \
 	     --library=atk-1.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -122,9 +114,7 @@
 GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
 GdkPixbuf.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace GdkPixbuf --strip-prefix=Gdk \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
-             --include=$(GIRDIR)/Gio.gir \
+             --include=Gio.gir \
 	     --library=gdk_pixbuf-2.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -138,9 +128,7 @@
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
 Gdk.gir: cairo.gir Pango.gir xlib.gir GdkPixbuf.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace Gdk \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
-             --include=$(GIRDIR)/Gio.gir \
+             --include=Gio.gir \
              --include=$(srcdir)/cairo.gir \
              --include=$(srcdir)/Pango.gir \
              --include=$(srcdir)/xlib.gir \
@@ -164,9 +152,7 @@
 GTK_LIBDIR=`pkg-config --variable=libdir gtk+-2.0`
 Gtk.gir: cairo.gir Pango.gir Atk.gir xlib.gir GdkPixbuf.gir Gdk.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace Gtk \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
-             --include=$(GIRDIR)/Gio.gir \
+             --include=Gio.gir \
              --include=$(srcdir)/cairo.gir \
              --include=$(srcdir)/Pango.gir \
              --include=$(srcdir)/Atk.gir \
@@ -197,9 +183,7 @@
 WEBKIT_LIBDIR=`pkg-config --variable=libdir webkit-1.0`
 WebKit.gir: JSCore.gir Gtk.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace WebKit \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
-             --include=$(srcdir)/Gdk.gir \
+             --include=GObject.gir \
              --include=$(srcdir)/Gtk.gir \
              --include=$(srcdir)/JSCore.gir \
 	     --library=webkit-1.0 \
@@ -220,8 +204,7 @@
 CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.6`
 ClutterJson.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace ClutterJson \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
+             --include=GObject.gir \
 	     --library=clutter-glx-0.6 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -233,11 +216,9 @@
 Clutter.gir: $(srcdir)/Pango.gir $(srcdir)/PangoFT2.gir $(G_IR_SCANNER) Makefile
 Clutter.gir: $(srcdir)/ClutterJson.gir $(srcdir)/GdkPixbuf.gir
 	$(G_IR_SCANNER) -v --namespace Clutter \
-             --include=$(srcdir)/fontconfig.gir \
-             --include=$(srcdir)/xlib.gir \
              --include=$(srcdir)/GL.gir \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
+             --include=GObject.gir \
+             --include=$(srcdir)/xlib.gir \
              --include=$(srcdir)/Pango.gir \
              --include=$(srcdir)/PangoFT2.gir \
              --include=$(srcdir)/GdkPixbuf.gir \
@@ -258,11 +239,8 @@
 ClutterGtk.gir: $(srcdir)/Clutter.gir $(G_IR_SCANNER) Makefile
 ClutterGtk.gir: $(srcdir)/Gtk.gir
 	$(G_IR_SCANNER) -v --namespace ClutterGtk \
-             --include=$(srcdir)/fontconfig.gir \
-             --include=$(srcdir)/xlib.gir \
              --include=$(srcdir)/GL.gir \
-             --include=$(GIRDIR)/GLib.gir \
-             --include=$(GIRDIR)/GObject.gir \
+             --include=GObject.gir \
              --include=$(srcdir)/Gtk.gir \
              --include=$(srcdir)/Clutter.gir \
 	     --library=clutter-gtk-0.6 \
@@ -291,7 +269,7 @@
 
 %.typelib: %.gir Makefile
 	$(DEBUG) $(G_IR_COMPILER) $(G_IR_COMPILER_OPTS) $< -o $@
-	$(G_IR_SCANNER) --typelib-xml $< > $<.tmp && mv $<.tmp $<.txml
+	$(G_IR_GENERATE) $@ > $  tmp && mv $<.tmp $<.xml
 
 %.typelib.gdb: %.gir Makefile
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< -o $@
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]