gir-repository r134 - trunk/gir

From: walters svn gnome org
To: svn-commits-list gnome org
Subject: gir-repository r134 - trunk/gir
Date: Thu, 16 Oct 2008 01:42:19 +0000 (UTC)
Author: walters
Date: Thu Oct 16 01:42:19 2008
New Revision: 134
URL: http://svn.gnome.org/viewvc/gir-repository?rev=134&view=rev

Log:
Includes handling


Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Oct 16 01:42:19 2008
@@ -28,7 +28,8 @@
 
 GConf-2.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GConf --nsversion=2.0 \
-            --include=GObject-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
             --library=gconf-2 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -43,7 +44,8 @@
 SOUP_LIBDIR=`pkg-config --variable=libdir libsoup-2.4`
 Soup-2.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Soup --nsversion=2.0 \
-            --include=Gio-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=Gio-2.0 \
             --library=soup-2.4 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -58,7 +60,8 @@
 GNOMEKEYRING_LIBDIR=`pkg-config --variable=libdir gnome-keyring-1`
 GnomeKeyring-2.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GnomeKeyring --nsversion=2.0 \
-            --include=GObject-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
             --library=gnome-keyring \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -75,8 +78,9 @@
 PANGO_LIBDIR=`pkg-config --variable=libdir pango`
 Pango-1.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \
-            --include=GObject-2.0.gir \
-            --include=$(srcdir)/cairo-1.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=cairo-1.0 \
             --library=pango-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -91,10 +95,11 @@
 PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
 PangoFT2-1.0.gir: fontconfig-2.0.gir freetype2-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
-            --include=GObject-2.0.gir \
-            --include=./Pango-1.0.gir \
-            --include=$(srcdir)/freetype2-2.0.gir \
-            --include=$(srcdir)/fontconfig-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=Pango-1.0 \
+            --include=freetype2-2.0 \
+            --include=fontconfig-2.0 \
             --library=pangoft2-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -109,9 +114,10 @@
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
 PangoCairo-1.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
-            --include=GObject-2.0.gir \
-            --include=./Pango-1.0.gir \
-            --include=$(srcdir)/cairo-1.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=Pango-1.0 \
+            --include=cairo-1.0 \
             --library=pangocairo-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -125,10 +131,11 @@
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
 PangoXft-1.0.gir: fontconfig-2.0.gir xft-2.0.gir xlib-2.0.gir Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
-            --include=GObject-2.0.gir \
-            --include=$(srcdir)/xft-2.0.gir \
-            --include=$(srcdir)/xlib-2.0.gir \
-            --include=$(srcdir)/PangoFT2-1.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=xft-2.0 \
+            --include=xlib-2.0 \
+            --include=PangoFT2-1.0 \
             --library=pangoxft-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -143,9 +150,10 @@
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
 PangoX-1.0.gir: xlib-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoX --nsversion=1.0 \
-            --include=GObject-2.0.gir \
-            --include=$(srcdir)/xlib-2.0.gir \
-            --include=./Pango-1.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=xlib-2.0 \
+            --include=Pango-1.0 \
             --library=pangox-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -163,10 +171,11 @@
 POPPLER_LIBDIR=`pkg-config --variable=libdir poppler-glib`
 PopplerGlib-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PopplerGlib --nsversion=0.8 \
-             --include=GObject-2.0.gir \
-             --include=$(srcdir)/Pango-1.0.gir \
-             --include=$(srcdir)/Gdk-2.0.gir \
-             --include=$(srcdir)/cairo-1.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
+             --include=Pango-1.0 \
+             --include=Gdk-2.0 \
+             --include=cairo-1.0 \
              --library=poppler-glib \
              $(NOCLOSURE) \
              --output $@ \
@@ -183,7 +192,8 @@
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
 Atk-1.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Atk --nsversion=1.0 \
-             --include=GObject-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
 	     --library=atk-1.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -199,7 +209,8 @@
 GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
 GdkPixbuf-2.0.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GdkPixbuf --nsversion=2.0 --strip-prefix=Gdk\
-             --include=Gio-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gio-2.0 \
 	     --library=gdk_pixbuf-2.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -214,11 +225,12 @@
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-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 \
-             --include=Gio-2.0.gir \
-             --include=$(srcdir)/cairo-1.0.gir \
-             --include=./Pango-1.0.gir \
-             --include=$(srcdir)/xlib-2.0.gir \
-             --include=./GdkPixbuf-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gio-2.0 \
+             --include=cairo-1.0 \
+             --include=Pango-1.0 \
+             --include=xlib-2.0 \
+             --include=GdkPixbuf-2.0 \
 	     --library=gdk-x11-2.0 \
 	     $(NOCLOSURE) \
              --output $@ \
@@ -238,12 +250,13 @@
 GTK_LIBDIR=`pkg-config --variable=libdir gtk+-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 \
-             --include=Gio-2.0.gir \
-             --include=$(srcdir)/cairo-1.0.gir \
-             --include=./Pango-1.0.gir \
-             --include=./Atk-1.0.gir \
-             --include=./GdkPixbuf-2.0.gir \
-             --include=./Gdk-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gio-2.0 \
+             --include=cairo-1.0 \
+             --include=Pango-1.0 \
+             --include=Atk-1.0 \
+             --include=GdkPixbuf-2.0 \
+             --include=Gdk-2.0 \
 	     --library=gtk-x11-2.0 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -270,9 +283,10 @@
 WEBKIT_LIBDIR=`pkg-config --variable=libdir webkit-1.0`
 WebKit-1.0.gir: JSCore-1.0.gir Gtk-2.0.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
-             --include=GObject-2.0.gir \
-             --include=./Gtk-2.0.gir \
-             --include=$(srcdir)/JSCore-1.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
+             --include=Gtk-2.0 \
+             --include=JSCore-1.0 \
 	     --library=webkit-1.0 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -292,7 +306,8 @@
 NOTIFY_LIBDIR=`pkg-config --variable=libdir libnotify`
 Notify-0.4.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Notify --nsversion=0.4 \
-             --include=./Gtk-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gtk-2.0 \
 	     --library=notify \
 	     $(NOCLOSURE) \
              --pkg gtk+-2.0 \
@@ -308,7 +323,8 @@
 GTKSOURCEVIEW_LIBDIR=`pkg-config --variable=libdir gtksourceview-2.0`
 GtkSource-2.2.gir: $(G_IR_SCANNER) Gtk-2.0.gir
 	$(G_IR_SCANNER) -v --namespace GtkSource --nsversion=2.2 \
-             --include=./Gtk-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gtk-2.0 \
 	     --library=gtksourceview-2.0 \
 	     $(NOCLOSURE) \
              --pkg gtk+-2.0 \
@@ -324,7 +340,8 @@
 VTE_LIBDIR=`pkg-config --variable=libdir vte`
 Vte-1.0.gir: $(G_IR_SCANNER) Gtk-2.0.gir
 	$(G_IR_SCANNER) -v --namespace Vte --nsversion=1.0 \
-             --include=./Gtk-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gtk-2.0 \
 	     --library=vte \
 	     $(NOCLOSURE) \
              --pkg gtk+-2.0 \
@@ -354,7 +371,8 @@
 CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.8`
 ClutterJson-0.8.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
-             --include=GObject-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
 	     --library=clutter-glx-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -365,14 +383,15 @@
 
 Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterAdditions.xml ClutterJson-0.8.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Clutter --nsversion=0.8 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
 	     --strip-prefix=girepo \
-             --include=$(srcdir)/GL-1.0.gir \
-             --include=GObject-2.0.gir \
-             --include=$(srcdir)/xlib-2.0.gir \
-             --include=./Pango-1.0.gir \
-             --include=./PangoCairo-1.0.gir \
-             --include=./GdkPixbuf-2.0.gir \
-             --include=./ClutterJson-0.8.gir \
+             --include=GL-1.0 \
+             --include=GObject-2.0 \
+             --include=xlib-2.0 \
+             --include=Pango-1.0 \
+             --include=PangoCairo-1.0 \
+             --include=GdkPixbuf-2.0 \
+             --include=ClutterJson-0.8 \
 	     --library=clutter-glx-0.8 \
 	     --library=girepo-Clutter-custom \
 	     $(NOCLOSURE) \
@@ -391,10 +410,11 @@
 CLUTTERGTK_LIBDIR=`pkg-config --variable=libdir clutter-gtk-0.8`
 ClutterGtk-0.8.gir: Clutter-0.8.gir Gtk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterGtk --nsversion=0.8 \
-             --include=$(srcdir)/GL-1.0.gir \
-             --include=GObject-2.0.gir \
-             --include=./Gtk-2.0.gir \
-             --include=./Clutter-0.8.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GL-1.0 \
+             --include=GObject-2.0 \
+             --include=Gtk-2.0 \
+             --include=Clutter-0.8 \
 	     --library=clutter-gtk-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -411,8 +431,9 @@
 CLUTTERCAIRO_LIBDIR=`pkg-config --variable=libdir clutter-cairo-0.8`
 ClutterCairo-0.8.gir: Clutter-0.8.gir $(srcdir)/cairo-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterCairo --nsversion=0.8 \
-             --include=$(srcdir)/cairo-1.0.gir \
-             --include=./Clutter-0.8.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=cairo-1.0 \
+             --include=Clutter-0.8 \
 	     --library=clutter-cairo-0.8 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -429,8 +450,9 @@
 GOOCANVAS_LIBDIR=`pkg-config --variable=libdir goocanvas`
 GooCanvas-0.10.gir: Gtk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GooCanvas --nsversion=0.10 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
 	     --strip-prefix=Goo \
-             --include=./Gtk-2.0.gir \
+             --include=Gtk-2.0 \
 	     --library=goocanvas \
 	     $(NOCLOSURE) \
              --pkg goocanvas \
@@ -446,9 +468,10 @@
 GST_LIBDIR=`pkg-config --variable=libdir gstreamer-0.10`
 Gst-0.10.gir: libxml2-2.0.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace Gst --nsversion=0.10 \
-             --include=GObject-2.0.gir \
-             --include=GModule-2.0.gir \
-             --include=$(srcdir)/libxml2-2.0.gir \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
+             --include=GModule-2.0 \
+             --include=libxml2-2.0 \
 	     --library=gstreamer-0.10 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
@@ -516,8 +539,9 @@
 MISSIONCONTROL_LIBDIR=`pkg-config --variable=libdir libmissioncontrol`
 MissionControl.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace MissionControl \
+	    --add-include-path=$(srcdir) --add-include-path=. \
 	     --strip-prefix=mc \
-             --include=$(srcdir)/LibTelepathy.gir \
+             --include=LibTelepathy \
 	     --library=missioncontrol-client \
 	     $(NOCLOSURE) \
              --pkg libmissioncontrol \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]