gnome-scan r634 - in trunk: . bindings/gir

[bersace svn gnome org]

Author: bersace
Date: Wed Nov 12 22:41:04 2008
New Revision: 634
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=634&view=rev

Log:
Fix gir generation, installation and uninstallation

Modified:
   trunk/ChangeLog
   trunk/bindings/gir/Makefile.am
   trunk/configure.ac

Modified: trunk/bindings/gir/Makefile.am
==============================================================================
--- trunk/bindings/gir/Makefile.am	(original)
+++ trunk/bindings/gir/Makefile.am	Wed Nov 12 22:41:04 2008
@@ -1,12 +1,14 @@
-all: GnomeScan-1.0.gir
+gir_DATA = GnomeScan- API_VERSION@.gir
 
-GnomeScan-1.0.gir: $(G_IR_SCANNER)
-	$(G_IR_SCANNER) -v --namespace GnomeScan --nsversion=1.0 \
+GnomeScan- API_VERSION@.gir: $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace GnomeScan --nsversion= API_VERSION@ \
             --add-include-path=$(srcdir) --add-include-path=\
 	    --include=Gtk-2.0 \
-	    --library-path=$(top_srcdir)/lib/.libs/ \
-            --library=$(top_srcdir)/lib/.libs/libgnomescan.so.0 \
+	    --library-path=$(top_builddir)/lib/.libs/ \
+            --library=$(top_builddir)/lib/.libs/libgnomescan.so.0 \
             --output $@ \
 	    --pkg gtk+-2.0 \
             -I$(top_srcdir) \
 	    $(top_srcdir)/lib/*.h
+
+DISTCLEANFILES = $(gir_DATA)
\ No newline at end of file

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Nov 12 22:41:04 2008
@@ -62,7 +62,7 @@
 AC_SUBST(API_VERSION)
 
 
-PKG_CHECK_MODULES(GNOME_SCAN, [gmodule-2.0 gthread-2.0 glib-2.0 gdk-2.0 >= 2.11 gdk-pixbuf-2.0 gtk+-2.0 >= 2.12 gegl >= 0.0.16 gconf-2.0 ])
+PKG_CHECK_MODULES(GNOME_SCAN, [gmodule-2.0 gthread-2.0 glib-2.0 gdk-2.0 >= 2.11 gdk-pixbuf-2.0 gtk+-2.0 >= 2.12 gegl >= 0.0.21 gconf-2.0 ])
 AC_SUBST(GNOME_SCAN_CFLAGS)
 AC_SUBST(GNOME_SCAN_LIBS)
 
@@ -149,13 +149,13 @@
 AC_SUBST(GIMP_LIBDIR)
 
 # GObject Introspection, required
-PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0])
+PKG_CHECK_MODULES(GIR, [gobject-introspection-1.0 gir-repository-1.0])
 
 G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
 AC_SUBST(G_IR_SCANNER)
 
-GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-AC_SUBST(GIRDIR)
+girdir=`$PKG_CONFIG $pcdv --variable=girdir gobject-introspection-1.0`
+AC_SUBST(girdir)
 
 AC_OUTPUT([
 	gnome-scan.pc