[glom/glom-1-18] tests: Link to all necessary libraries.

[Murray Cumming <murrayc src gnome org>]

commit 4f1585760486ebc9e6487261dd8375d6e086af9c
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 6 00:18:16 2011 +0100

    tests: Link to all necessary libraries.
    
    * Makefile_libglom.am: Define libglom_all_libs to avoid duplication.
    * Makefile_glom.am: Use libglom_all_libs instead of repeating.
    * Makefile_tests.am: Use libglom_all_libs to explicitly link against the
    dependencies of libglom. This seems to have been automatic with the linker in
    previous versions of Ubuntu, but not with Ubuntu Natty.

 ChangeLog           |   10 ++++++++++
 Makefile_glom.am    |    4 ++--
 Makefile_libglom.am |    5 ++++-
 Makefile_tests.am   |    3 +--
 4 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cc4c84e..05491ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-06  Murray Cumming  <murrayc murrayc com>
+
+	tests: Link to all necessary libraries.
+
+	* Makefile_libglom.am: Define libglom_all_libs to avoid duplication.
+	* Makefile_glom.am: Use libglom_all_libs instead of repeating.
+	* Makefile_tests.am: Use libglom_all_libs to explicitly link against the 
+	dependencies of libglom. This seems to have been automatic with the linker in 
+	previous versions of Ubuntu, but not with Ubuntu Natty.
+
 2011-02-25  Murray Cumming  <murrayc murrayc com>
 
 	Adapt to libgdamm API change.
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 56410bb..590c63d 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -364,8 +364,8 @@ glom_glom_SOURCES =							\
 	$(glom_source_files)
 
 glom_all_libs = $(win_resfile) \
-	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
-	$(GLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS) $(INTLLIBS)
+	glom/libglom/libglom-$(GLOM_ABI_VERSION).la $(libglom_all_libs) \
+	$(GLOM_LIBS) $(INTLLIBS)
 if !GLOM_ENABLE_MAEMO
 glom_all_libs += -lgettextpo
 endif
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index 668599a..bc6515e 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -42,7 +42,10 @@ libglom_d_b_view_includedir = $(libglom_d_bakery_includedir)/view
 libglom_d_b_view_include_HEADERS = $(libglom_d_b_view_headers)
 
 glom_libglom_libglom_ GLOM_ABI_VERSION@_la_SOURCES = $(libglom_sources)
-glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD  = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
+
+libglom_all_libs = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD = $(libglom_all_libs)
+
 if HOST_WIN32
 glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD += -lws2_32
 endif
diff --git a/Makefile_tests.am b/Makefile_tests.am
index b86fcf9..aa313a7 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -51,8 +51,7 @@ dist_noinst_SCRIPTS = tests/test_dtd_file_validation.sh \
 
 #TESTS_ENVIRONMENT=which valgrind && valgrind --tool=memcheck --leak-check=full --leak-resolution=high --trace-children=yes --num-callers=30
 
-# This also links to the libraries in LIBGLOM_LIBS
-tests_ldadd = glom/libglom/libglom-$(GLOM_ABI_VERSION).la
+tests_ldadd = glom/libglom/libglom-$(GLOM_ABI_VERSION).la $(libglom_all_libs)
 
 glom_libglom_test_connectionpool_SOURCES = glom/libglom/test_connectionpool.cc
 glom_libglom_example_document_load_SOURCES = glom/libglom/example_document_load.cc