summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid King <davidk@openismus.com>2010-03-10 10:28:15 +0100
committerDavid King <davidk@openismus.com>2010-03-11 16:57:24 +0100
commitd6710ad56667270bb30a6498d95172f7ff7c4023 (patch)
tree4b7b042fbc5c57fe709cfc7c623d2564417c4fbf
parenta96fce281a705abc1b7fd60d4b174a4703a5f064 (diff)
downloadglibmm-d6710ad56667270bb30a6498d95172f7ff7c4023.tar.gz
Reorder assignment to LDADD and giomm_ldadd in tests/Makefile.am
* tests/Makefile.am: Reorder values assigned to LDADD and giomm_ldadd to place built libraries before system libraries. Fixes GNOME bug #610854.
-rw-r--r--ChangeLog8
-rw-r--r--tests/Makefile.am6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5208e86b..cfcceac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-10 David King <davidk@openismus.com>
+
+ Reorder assignment to LDADD and giomm_ldadd in tests/Makefile.am
+
+ * tests/Makefile.am: Reorder values assigned to LDADD and
+ giomm_ldadd to place built libraries before system libraries.
+ Fixes GNOME bug #610854.
+
2009-11-23 Murray Cumming <murrayc@murrayc.com>
Regex: Slight documentation improvement.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6be23469..88125953 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/>
+## Copyright (c) 2009, 2010 Openismus GmbH <http://www.openismus.com/>
##
## This file is part of glibmm.
##
@@ -36,8 +36,8 @@ AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
local_libglibmm = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
local_libgiomm = $(top_builddir)/gio/giomm/libgiomm-$(GIOMM_API_VERSION).la
-LDADD = $(GLIBMM_LIBS) $(local_libglibmm)
-giomm_ldadd = $(GIOMM_LIBS) $(local_libglibmm) $(local_libgiomm)
+LDADD = $(local_libglibmm) $(GLIBMM_LIBS)
+giomm_ldadd = $(local_libglibmm) $(local_libgiomm) $(GIOMM_LIBS)
giomm_ioerror_test_SOURCES = giomm_ioerror/main.cc
giomm_ioerror_test_LDADD = $(giomm_ldadd)