gir-repository r8 - in trunk: . gir

[juergbi svn gnome org]

Author: juergbi
Date: Thu Jun  5 13:23:37 2008
New Revision: 8
URL: http://svn.gnome.org/viewvc/gir-repository?rev=8&view=rev

Log:
2008-06-05  JÃrg Billeter  <j bitron ch>

	* gir/Makefile.am:
	* gir/atk.gir:
	Rename from atk-1.0.gir to atk.gir to match pkg-config name


Added:
   trunk/gir/atk.gir
      - copied unchanged from r7, /trunk/gir/atk-1.0.gir
Removed:
   trunk/gir/atk-1.0.gir
Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Jun  5 13:23:37 2008
@@ -30,7 +30,7 @@
 # atk
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
-atk-1.0.gir:
+atk.gir:
 	$(G_IR_SCANNER) -v --namespace Atk \
              --include=$(GIRDIR)/gobject-2.0.gir \
 	     --library=$(ATK_LIBDIR)/libatk-1.0.so.0 \
@@ -38,7 +38,7 @@
              --pkg gobject-2.0 \
              -I$(ATK_INCLUDEDIR) \
              $(ATK_INCLUDEDIR)/atk/*.h
-GIRSOURCES += atk-1.0.gir
+GIRSOURCES += atk.gir
 
 # gdk
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
@@ -48,12 +48,12 @@
              --include=$(GIRDIR)/gobject-2.0.gir \
              --include=$(srcdir)/cairo.gir \
              --include=$(srcdir)/pango-1.0.gir \
-             --include=$(srcdir)/atk-1.0.gir \
+             --include=$(srcdir)/atk.gir \
 	     --library=$(GDK_LIBDIR)/libgdk-x11-2.0.so.0 \
              --output $@ \
              --pkg gobject-2.0 \
              --pkg cairo \
-             --pkg atk-1.0 \
+             --pkg atk \
              --pkg pango-1.0 \
              --pkg gdk-2.0 \
              -I$(GDK_INCLUDEDIR) \
@@ -68,12 +68,12 @@
              --include=$(GIRDIR)/gobject-2.0.gir \
              --include=$(srcdir)/cairo.gir \
              --include=$(srcdir)/pango-1.0.gir \
-             --include=$(srcdir)/atk-1.0.gir \
+             --include=$(srcdir)/atk.gir \
              --include=$(srcdir)/gdk-x11-2.0.gir \
 	     --library=$(GTK_LIBDIR)/libgtk-x11-2.0.so.0 \
              --pkg gobject-2.0 \
              --pkg cairo \
-             --pkg atk-1.0 \
+             --pkg atk \
              --pkg pango-1.0 \
              --pkg gdk-2.0 \
              --pkg gtk+-2.0 \