[glib/glib-2-30] build: link against gthread and gmodule

[Matthias Clasen <matthiasc src gnome org>]

commit 02f5d4e13e417f5cdc570b6247b11813fb8fd1b0
Author: VÃctor Manuel JÃquez Leal <vjaquez igalia com>
Date:   Fri Mar 9 12:45:41 2012 +0100

    build: link against gthread and gmodule
    
    When cross-compiling with linaro toolchain 4.6.2, I got several
    linking errors about missing symbols because a couple libraries are
    not linked.
    
    This patch adds to the LDADD flags the missed libraries.
    
    This patch applies above the glib-2-30 branch.
    
    Signed-off-by: VÃctor Manuel JÃquez Leal <vjaquez igalia com>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=671711

 gio/Makefile.am       |   18 ++++++++++--------
 gio/tests/Makefile.am |    1 +
 tests/Makefile.am     |    2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index ed49e62..c36f7b9 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -48,6 +48,12 @@ AM_CPPFLAGS = \
 
 lib_LTLIBRARIES = libgio-2.0.la
 
+gio_dependency_libs = 	\
+	$(top_builddir)/glib/libglib-2.0.la		\
+	$(top_builddir)/gobject/libgobject-2.0.la	\
+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
+	$(top_builddir)/gthread/libgthread-2.0.la
+
 gdbus_headers = 			\
 	gdbusauthobserver.h		\
 	gcredentials.h			\
@@ -602,10 +608,8 @@ bin_PROGRAMS = gio-querymodules glib-compile-schemas gsettings
 
 gio_querymodules_SOURCES = gio-querymodules.c
 gio_querymodules_LDADD	 = \
-	$(top_builddir)/glib/libglib-2.0.la		\
-	$(top_builddir)/gobject/libgobject-2.0.la	\
-	$(top_builddir)/gmodule/libgmodule-2.0.la	\
-	libgio-2.0.la					\
+	$(gio_dependency_libs)	\
+	libgio-2.0.la		\
 	$(NULL)
 
 glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
@@ -616,8 +620,7 @@ glib_compile_schemas_SOURCES = \
 	glib-compile-schemas.c
 
 gsettings_LDADD = \
-	$(top_builddir)/glib/libglib-2.0.la		\
-	$(top_builddir)/gobject/libgobject-2.0.la	\
+	$(gio_dependency_libs)	\
 	libgio-2.0.la
 gsettings_SOURCES = gsettings-tool.c
 
@@ -630,8 +633,7 @@ dist_schema_DATA = gschema.dtd
 bin_PROGRAMS += gdbus
 gdbus_SOURCES = gdbus-tool.c
 gdbus_LDADD = libgio-2.0.la \
-	$(top_builddir)/glib/libglib-2.0.la 		\
-	$(top_builddir)/gobject/libgobject-2.0.la
+	$(gio_dependency_libs)
 
 completiondir = $(sysconfdir)/bash_completion.d
 completion_DATA = \
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 28e9a18..d57a192 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -22,6 +22,7 @@ progs_ldadd     = 					\
 	$(top_builddir)/glib/libglib-2.0.la 		\
 	$(top_builddir)/gthread/libgthread-2.0.la	\
 	$(top_builddir)/gobject/libgobject-2.0.la	\
+	$(top_builddir)/gmodule/libgmodule-2.0.la	\
 	$(top_builddir)/gio/libgio-2.0.la
 
 TEST_PROGS +=	 		\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9938c8d..fbb8082 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -79,7 +79,7 @@ errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS)
 assert_msg_test_LDADD = $(libglib)
 if ENABLE_TIMELOOP
 timeloop_LDADD = $(libglib)
-timeloop_closure_LDADD = $(libglib) $(libgobject)
+timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread)
 endif
 datetime_LDADD = $(libglib)