[gnome-sudoku/vala-port] Update build-sys

[Thomas Hindoe Paaboel Andersen <thomashpa src gnome org>]

commit 5fe8077c9fdc6113baabf8068d886f3fcb86f8a2
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date:   Sun Jun 9 01:21:44 2013 +0200

    Update build-sys

 configure.ac    |    5 +++--
 src/Makefile.am |   23 ++++++++---------------
 2 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 19b2c5f..c6319a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,15 +16,16 @@ dnl ###########################################################################
 GTK_REQUIRED=3.4.0
 
 PKG_CHECK_MODULES(GNOME_SUDOKU, [
+  gio-2.0
   gtk+-3.0 >= $GTK_REQUIRED
+  gee-1.0
 ])
 
 dnl ###########################################################################
 dnl GResources
 dnl ###########################################################################
 
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
+AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 
 dnl ###########################################################################
 dnl Internationalization
diff --git a/src/Makefile.am b/src/Makefile.am
index 38ffad3..ffcd557 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ gnome_sudoku_SOURCES = \
        main.vala \
        gnome-sudoku.vala \
        sudoku-board.vala \
-    sudoku-game.vala \
+       sudoku-game.vala \
        sudoku-generator.vala \
        sudoku-store.vala \
        sudoku-solver.vala \
@@ -20,26 +20,19 @@ gnome_sudoku_CFLAGS = \
        -DPKGDATADIR=\"@datadir@/gnome-sudoku\" \
        -DLOCALEDIR=\"@localedir \" \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       $(GTK_CFLAGS) \
-       $(GEE_CFLAGS) \
-       $(GMODULE_CFLAGS) \
-       $(WARN_CFLAGS)
+       $(GNOME_SUDOKU_CFLAGS)
 
 gnome_sudoku_LDADD = \
-       $(GTK_LIBS) \
-       $(GEE_LIBS) \
-       $(GMODULE_LIBS)
+       $(GNOME_SUDOKU_LIBS)
 
 gnome_sudoku_VALAFLAGS = \
-    --pkg posix \
-    --pkg gtk+-3.0 \
-    --pkg gee-1.0 \
-    --pkg gmodule-2.0 \
-    --vapidir $(top_srcdir)/libgames-support \
-    --pkg GnomeGamesSupport-1.0
+       --pkg posix \
+       --pkg gio-2.0 \
+       --pkg gtk+-3.0 \
+       --pkg gee-1.0
 
 gnome-sudoku-resources.c: gnome-sudoku.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies gnome-sudoku.gresource.xml)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
gnome-sudoku.gresource.xml
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 EXTRA_DIST = \
        gnome_sudoku.gresource.xml