From 7590703aa910f45fc195a928e0c308817135dea1 Mon Sep 17 00:00:00 2001
From: Pauli Nieminen <paniemin@cc.hut.fi>
Date: Tue, 15 Jan 2008 09:45:10 +0000
Subject: [PATCH] Fixed boost.test configuration not to mess with other targets

---
 configure.ac    |  3 ---
 src/Makefile.am | 10 +++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 10c446d4799..531e42c7450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -905,9 +905,6 @@ if test "x$tests" = "xyes"; then
 #		BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS="-L/usr/lib -R/usr/lib"
 	fi
 
-	LDFLAGS="$BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS $LDFLAGS"
-	LIBS="$BOOST_UNIT_TEST_FRAMEWORK_LIBS $LIBS"
-
 	AC_LANG([C++])
 	AC_MSG_CHECKING([for dynamic linked boost test])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a47ed80af8d..6f9b8765e18 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -112,8 +112,8 @@ wesnoth_source = \
 #############################################################################
 
 wesnoth_SOURCES = \
-	$(wesnoth_source) \
-	game.cpp 
+	game.cpp \
+	$(wesnoth_source)
 	
 wesnoth_LDADD = $(THELIBS) libwesnoth.a
 wesnoth_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
@@ -202,11 +202,11 @@ cutter_DEPENDENCIES=libwesnoth-core.a
 #############################################################################
 
 test_SOURCES = \
-	$(wesnoth_source) \
 	tests/main.cpp \
-	tests/test_util.cpp
+	tests/test_util.cpp \
+	$(wesnoth_source)
 
-test_LDADD = -lboost_unit_test_framework $(THELIBS) libwesnoth.a 
+test_LDADD = $(THELIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) libwesnoth.a 
 test_DEPENDENCIES=libwesnoth-core.a libwesnoth.a
 
 #############################################################################