diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -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. + 2.23.3: 2010-03-08 Krzesimir Nowak <qdlacz@gmail.com> diff --git a/tests/Makefile.am b/tests/Makefile.am index fb090d3f..c9c02658 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. ## @@ -38,8 +38,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) |