[gnome-keyring/gnome-3-2] Build correctly with glib 2.31

[Stefan Walter <stefw src gnome org>]

commit 30915a6fc4b95bbe6a5da224f731480e78bbaf83
Author: Stef Walter <stefw collabora co uk>
Date:   Wed Oct 26 13:57:51 2011 +0200

    Build correctly with glib 2.31
    
     * Link to gthread correctly.

 configure.ac                       |    3 +++
 daemon/Makefile.am                 |   12 +-----------
 daemon/gpg-agent/Makefile.am       |   10 ++--------
 daemon/ssh-agent/Makefile.am       |    8 ++------
 pkcs11/gkm/tests/Makefile.am       |    3 ++-
 pkcs11/xdg-store/tests/Makefile.am |    1 +
 6 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 32c4051..fd12835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,9 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS"
+DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS"
+
 GETTEXT_PACKAGE=gnome-keyring
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 825ab4a..af9d57d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -17,10 +17,6 @@ INCLUDES=	\
 	-I$(top_srcdir)/daemon 				\
 	-I$(top_builddir) 				\
 	$(DAEMON_CFLAGS)				\
-	$(GOBJECT_CFLAGS)				\
-	$(GTHREAD_CFLAGS)				\
-	$(GIO_CFLAGS)					\
-	$(GLIB_CFLAGS) 					\
 	-DGCK_API_SUBJECT_TO_CHANGE
 
 gnome_keyring_daemon_SOURCES = \
@@ -47,13 +43,7 @@ gnome_keyring_daemon_LDADD = \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
 	$(top_builddir)/gck/libgck- GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg-dbus.la \
-	$(DAEMON_LIBS) \
-	$(GOBJECT_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(GIO_LIBS) \
-	$(DAEMON_LIBS) \
-	$(GOBJECT_LIBS) \
-	$(GLIB_LIBS)
+	$(DAEMON_LIBS)
 
 service_in_files = \
 	org.gnome.keyring.service.in \
diff --git a/daemon/gpg-agent/Makefile.am b/daemon/gpg-agent/Makefile.am
index 7f95ace..6b83954 100644
--- a/daemon/gpg-agent/Makefile.am
+++ b/daemon/gpg-agent/Makefile.am
@@ -4,9 +4,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
 	-DGCK_API_SUBJECT_TO_CHANGE \
-	$(GOBJECT_CFLAGS) \
-	$(GIO_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(DAEMON_CFLAGS)
 
 # ------------------------------------------------------------------------------
 # The ssh-agent component code
@@ -33,8 +31,4 @@ gkd_gpg_agent_standalone_LDADD = \
 	$(top_builddir)/ui/libgku-prompt.la \
 	$(top_builddir)/gck/libgck- GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg.la \
-	$(GOBJECT_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(GIO_LIBS) \
-	$(LIBGCRYPT_LIBS) \
-	$(GLIB_LIBS)
+	$(DAEMON_LIBS)
diff --git a/daemon/ssh-agent/Makefile.am b/daemon/ssh-agent/Makefile.am
index 8d643b8..61680e4 100644
--- a/daemon/ssh-agent/Makefile.am
+++ b/daemon/ssh-agent/Makefile.am
@@ -3,8 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/pkcs11 \
-	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS) \
+	$(DAEMON_CFLAGS) \
 	-DGCK_API_SUBJECT_TO_CHANGE
 
 # ------------------------------------------------------------------------------
@@ -33,7 +32,4 @@ gkd_ssh_agent_standalone_LDADD = \
 	$(top_builddir)/gck/libgck- GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg-buffer.la \
 	$(top_builddir)/egg/libegg-secure.la \
-	$(GOBJECT_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(LIBGCRYPT_LIBS) \
-	$(GLIB_LIBS)
+	$(DAEMON_LIBS)
diff --git a/pkcs11/gkm/tests/Makefile.am b/pkcs11/gkm/tests/Makefile.am
index f18f951..e50ed08 100644
--- a/pkcs11/gkm/tests/Makefile.am
+++ b/pkcs11/gkm/tests/Makefile.am
@@ -11,6 +11,7 @@ LDADD = \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
 	$(top_builddir)/egg/libegg.la \
 	$(GLIB_LIBS) \
+	$(GTHREAD_LIBS) \
 	$(LIBGCRYPT_LIBS)
 
 noinst_LIBRARIES = libgkm-mock.a
@@ -20,7 +21,7 @@ BUILT_SOURCES = \
 
 libgkm_mock_a_SOURCES = \
 	mock-module.c mock-module.h \
-	mock-locked-object.c mock-locked-object.h
+	mock-locked-object.c mock-locked-object.h \
 	$(BUILT_SOURCES)
 
 TEST_PROGS = \
diff --git a/pkcs11/xdg-store/tests/Makefile.am b/pkcs11/xdg-store/tests/Makefile.am
index a0347b3..9f4db48 100644
--- a/pkcs11/xdg-store/tests/Makefile.am
+++ b/pkcs11/xdg-store/tests/Makefile.am
@@ -13,6 +13,7 @@ LDADD = \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
 	$(top_builddir)/egg/libegg.la \
 	$(GLIB_LIBS) \
+	$(GTHREAD_LIBS) \
 	$(LIBGCRYPT_LIBS)
 
 if WITH_P11_TESTS