[glibmm/glibmm-2-22] Reorder assignment to LDADD and giomm_ldadd in tests/Makefile.am



commit d6710ad56667270bb30a6498d95172f7ff7c4023
Author: David King <davidk openismus com>
Date:   Wed Mar 10 10:28:15 2010 +0100

    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.

 ChangeLog         |    8 ++++++++
 tests/Makefile.am |    6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5208e86..cfcceac 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 6be2346..8812595 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)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]