gir-repository r60 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Fri Aug 22 23:51:13 2008
New Revision: 60
URL: http://svn.gnome.org/viewvc/gir-repository?rev=60&view=rev

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

	* gir/Makefile.am: Be sure we include deps
	for WebKit, also make all targets dep on
	Makefile.




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

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Fri Aug 22 23:51:13 2008
@@ -9,7 +9,7 @@
 if BUILD_PANGO
 PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
 PANGO_LIBDIR=`pkg-config --variable=libdir pango`
-Pango.gir: $(G_IR_SCANNER)
+Pango.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace Pango \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -25,7 +25,7 @@
 BUILT_GIRSOURCES += Pango.gir
 
 PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
-PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir $(G_IR_SCANNER)
+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 \
@@ -44,7 +44,7 @@
 BUILT_GIRSOURCES += PangoFT2.gir
 
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
-PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER)
+PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace PangoCairo \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -61,7 +61,7 @@
 BUILT_GIRSOURCES += PangoCairo.gir
 
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
-PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir $(G_IR_SCANNER)
+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 \
@@ -82,7 +82,7 @@
 BUILT_GIRSOURCES += PangoXft.gir
 
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
-PangoX.gir: xlib.gir Pango.gir $(G_IR_SCANNER)
+PangoX.gir: xlib.gir Pango.gir $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace PangoX \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -103,7 +103,7 @@
 if BUILD_ATK
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
-Atk.gir: $(G_IR_SCANNER)
+Atk.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace Atk \
              --include=$(GIRDIR)/GLib.gir \
              --include=$(GIRDIR)/GObject.gir \
@@ -120,7 +120,7 @@
 if BUILD_GTK
 GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
 GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
-GdkPixbuf.gir: $(G_IR_SCANNER)
+GdkPixbuf.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace GdkPixbuf --strip-prefix=Gdk \
              --include=$(GIRDIR)/GLib.gir \
              --include=$(GIRDIR)/GObject.gir \
@@ -136,7 +136,7 @@
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
-Gdk.gir: cairo.gir Pango.gir xlib.gir GdkPixbuf.gir $(G_IR_SCANNER)
+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 \
@@ -162,7 +162,7 @@
 # gtk
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-2.0`/gtk-2.0
 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)
+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 \
@@ -195,10 +195,11 @@
 if BUILD_WEBKIT
 WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
 WEBKIT_LIBDIR=`pkg-config --variable=libdir webkit-1.0`
-WebKit.gir: JSCore.gir Gtk.gir $(G_IR_SCANNER)
+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=$(srcdir)/Gtk.gir \
              --include=$(srcdir)/JSCore.gir \
 	     --library=webkit-1.0 \
@@ -217,7 +218,7 @@
 if BUILD_CLUTTER
 CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-0.6`
 CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.6`
-ClutterJson.gir: $(G_IR_SCANNER)
+ClutterJson.gir: $(G_IR_SCANNER) Makefile
 	$(G_IR_SCANNER) -v --namespace ClutterJson \
              --include=$(GIRDIR)/GLib.gir \
              --include=$(GIRDIR)/GObject.gir \
@@ -229,7 +230,7 @@
 	     -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)/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 \
@@ -254,7 +255,7 @@
 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)/Clutter.gir $(G_IR_SCANNER) Makefile
 ClutterGtk.gir: $(srcdir)/Gtk.gir
 	$(G_IR_SCANNER) -v --namespace ClutterGtk \
              --include=$(srcdir)/fontconfig.gir \
@@ -286,10 +287,11 @@
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
-%.typelib: %.gir
+%.typelib: %.gir Makefile
 	$(DEBUG) $(G_IR_COMPILER) $(G_IR_COMPILER_OPTS) $< -o $@
+	$(G_IR_SCANNER) --typelib-xml $< > $<.tmp && mv $<.tmp $<.txml
 
-%.typelib.gdb: %.gir
+%.typelib.gdb: %.gir Makefile
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< -o $@
 
 TESTS = tests.py