--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES     = $(EXTRA_PROGRAMS)
 
 AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
 INCLUDES  = -I$(top_srcdir)/src 
-LDADD     = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+LDADD     = $(GLIB_LIBS) $(GTHREAD_LIBS) $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
 
 ##########
 
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -343,7 +343,7 @@ SUBDIRS = xmlrpc
 CLEANFILES = $(EXTRA_PROGRAMS)
 AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
 INCLUDES = -I$(top_srcdir)/src 
-LDADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS) $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
 
 ##########
 echoclient_SOURCES = echoclient.c
--- a/examples/xmlrpc/Makefile.am
+++ b/examples/xmlrpc/Makefile.am
@@ -10,7 +10,7 @@ noinst_PROGRAMS = \
 
 AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
 INCLUDES = -I$(top_srcdir)/src 
-LDADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS) $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
 
 libgnetxmlrpc_a_SOURCES = xmlrpc-client.c xmlrpc-server.c xmlrpc.h
 libgnetxmlrpc_a_LIBADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
@@ -18,9 +18,11 @@ libgnetxmlrpc_a_LIBADD = $(top_builddir)
 test_xmlrpc_client_SOURCES = test-xmlrpc-client.c xmlrpc.h
 test_xmlrpc_client_LDADD = \
 	libgnetxmlrpc.a \
-	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la \
+	$(GLIB_LIBS) $(GTHREAD_LIBS)
 
 test_xmlrpc_server_SOURCES = test-xmlrpc-server.c xmlrpc.h
 test_xmlrpc_server_LDADD = \
 	libgnetxmlrpc.a \
-	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la \
+	$(GLIB_LIBS) $(GTHREAD_LIBS)
--- a/examples/xmlrpc/Makefile.in
+++ b/examples/xmlrpc/Makefile.in
@@ -264,18 +264,20 @@ target_vendor = @target_vendor@
 noinst_LIBRARIES = libgnetxmlrpc.a
 AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
 INCLUDES = -I$(top_srcdir)/src 
-LDADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS) $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
 libgnetxmlrpc_a_SOURCES = xmlrpc-client.c xmlrpc-server.c xmlrpc.h
 libgnetxmlrpc_a_LIBADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
 test_xmlrpc_client_SOURCES = test-xmlrpc-client.c xmlrpc.h
 test_xmlrpc_client_LDADD = \
 	libgnetxmlrpc.a \
-	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la \
+	$(GLIB_LIBS) $(GTHREAD_LIBS)
 
 test_xmlrpc_server_SOURCES = test-xmlrpc-server.c xmlrpc.h
 test_xmlrpc_server_LDADD = \
 	libgnetxmlrpc.a \
-	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
+	$(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la \
+	$(GLIB_LIBS) $(GTHREAD_LIBS)
 
 all: all-am
 
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -144,7 +144,7 @@ help:
 # Our helper lib for unit tests
 ##############################################################################
 
-noinst_LIBRARIES = libgnetcheck.a
+check_LIBRARIES = libgnetcheck.a
 
 libgnetcheck_a_SOURCES = gnetcheck.c gnetcheck.h
 
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -362,7 +362,7 @@ LOOPS = 10
 ##############################################################################
 # Our helper lib for unit tests
 ##############################################################################
-noinst_LIBRARIES = libgnetcheck.a
+check_LIBRARIES = libgnetcheck.a
 libgnetcheck_a_SOURCES = gnetcheck.c gnetcheck.h
 
 ##############################################################################