X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2FMakefile.am;h=7be7fdcbbc67187827ba5020baac9de72d4ee92d;hb=47c9a640a773d57235bd27ab271c113630fa8816;hp=881230f6098239d51309b86a2c15f7045c1121aa;hpb=f1d6d57b100b334e635f56437c5a9748a97a232a;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 881230f..7be7fdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,10 @@
-## $Id: Makefile.am,v 1.64 2007-02-26 13:31:00 adam Exp $
+## $Id: Makefile.am,v 1.67 2008-02-27 11:08:49 adam Exp $
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_LDFLAGS = $(BOOST_LDFLAGS) \
-            $(BOOST_DATE_TIME_LIB) \
-            $(BOOST_PROGRAM_OPTIONS_LIB) \
-            $(BOOST_THREAD_LIB) \
-            $(YAZPPLALIB)
+AM_LDFLAGS =
 
 EXTRA_DIST=Jamfile.in
 
@@ -53,7 +49,10 @@ libmetaproxy_la_SOURCES = \
 
 # Rules for programs..
 
-LDADD= libmetaproxy.la
+LDADD = libmetaproxy.la \
+	$(YAZPPLALIB) \
+	$(BOOST_LIB) \
+	$(BOOST_THREAD_LIB)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -78,7 +77,7 @@ check_PROGRAMS = \
 	test_filter1 test_filter2 \
 	test_session1 test_session2 \
 	test_thread_pool_observer \
-	test_boost_threads test_boost_time \
+	test_boost_threads \
 	test_filter_auth_simple \
 	test_filter_factory \
 	test_filter_frontend_net \
@@ -103,7 +102,6 @@ test_filter2_SOURCES=test_filter2.cpp
 test_session1_SOURCES=test_session1.cpp
 test_session2_SOURCES=test_session2.cpp
 test_boost_threads_SOURCES=test_boost_threads.cpp
-test_boost_time_SOURCES=test_boost_time.cpp
 test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp
 test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp
 test_filter_factory_SOURCES = test_filter_factory.cpp
@@ -120,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)
@@ -129,7 +127,6 @@ test_filter2_LDADD = $(TESTLDADD)
 test_session1_LDADD = $(TESTLDADD)
 test_session2_LDADD = $(TESTLDADD)
 test_boost_threads_LDADD = $(TESTLDADD)
-test_boost_time_LDADD = $(TESTLDADD)
 test_filter_auth_simple_LDADD = $(TESTLDADD)
 test_filter_factory_LDADD = $(TESTLDADD)
 test_filter_frontend_net_LDADD = $(TESTLDADD)