X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2FMakefile.am;h=8448fa3b2dff3f73483b0133a03816c9011c13e4;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=f3bfb0a9911bfd36d8894733f24d6c1bf50a7974;hpb=913a80bace5d431131cfee20aa7e8e4c1f1136f7;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f3bfb0a..8448fa3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,11 @@
-## $Id: Makefile.am,v 1.67 2008-02-27 11:08:49 adam Exp $
+## This file is part of Metaproxy
+## Copyright (C) 2005-2009 Index Data
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_LDFLAGS = $(BOOST_LDFLAGS)
+AM_LDFLAGS =
 
 EXTRA_DIST=Jamfile.in
 
@@ -47,12 +48,11 @@ libmetaproxy_la_SOURCES = \
 	util.cpp util.hpp \
 	xmlutil.cpp xmlutil.hpp
 
-# Rules for programs..
+libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
 
-LDADD = libmetaproxy.la \
-	$(YAZPPLALIB) \
-	$(BOOST_DATE_TIME_LIB) \
-	$(BOOST_THREAD_LIB)
+# Rules for lib
+
+LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -118,7 +118,7 @@ test_filter_virt_db_SOURCES = test_filter_virt_db.cpp
 test_ses_map_SOURCES = test_ses_map.cpp
 test_router_flexml_SOURCES = test_router_flexml.cpp
 
-TESTLDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+TESTLDADD = $(LDADD) $(BOOST_TEST_LIB)
 
 test_package1_LDADD = $(TESTLDADD)
 test_pipe_LDADD = $(TESTLDADD)