[aisleriot] build: Update glib req

[Christian Persch <chpe src gnome org>]

commit e06b129d181c05f10b7d28ae82beb612acd5e148
Author: Christian Persch <chpe gnome org>
Date:   Wed Jan 25 18:53:09 2012 +0100

    build: Update glib req
    
    Require newest glib, and put xml-stripblanks back into the resource file.
    Also simplify the make rules now that glib-compile-resources can autogen
    the dependencies list.

 configure.ac                   |    4 ++--
 src/Makefile.am                |    8 ++------
 src/aisleriot.gresource.xml.in |    2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2f82c49..276a45f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,8 +290,8 @@ case "$with_gtk" in
 esac
 
 GCONF_REQUIRED=2.0
-GLIB_REQUIRED=2.31.10
-GIO_REQUIRED=2.31.10
+GLIB_REQUIRED=2.31.13
+GIO_REQUIRED=2.31.13
 
 # Check for common modules
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2c52966..d00b34f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -147,12 +147,8 @@ BUILT_SOURCES = \
 	ar-resources.h \
 	$(NULL)
 
-# FIXME autogen the dependencies from the gresource file too?
-ar-resources.c: aisleriot.gresource.xml Makefile
-	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate-source --c-name aisleriot $<
-
-ar-resources.h: aisleriot.gresource.xml Makefile
-	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate-header --c-name aisleriot $<
+ar-resources.h ar-resources.c: aisleriot.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/aisleriot.gresource.xml)
+	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate --c-name aisleriot $<
 
 schema_in_files = aisleriot.schemas.in
 if HAVE_GNOME
diff --git a/src/aisleriot.gresource.xml.in b/src/aisleriot.gresource.xml.in
index f49c54e..327ed0e 100644
--- a/src/aisleriot.gresource.xml.in
+++ b/src/aisleriot.gresource.xml.in
@@ -17,7 +17,7 @@
 -->
 <gresources>
   <gresource prefix="/org/gnome/aisleriot">
-    <file alias="art/slot.svg" compressed="true">@top_srcdir@/data/slot.svg</file>
+    <file alias="art/slot.svg" compressed="true" preprocess="xml-stripblanks">@top_srcdir@/data/slot.svg</file>
     <file alias="art/baize.png">@top_srcdir@/data/baize.png</file>
   </gresource>
 </gresources>