Removed BOOST_PROGRAM_OPTIONS_LIB references.

[metaproxy-moved-to-github.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2fd4fba..f3bfb0a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,10 @@
-## $Id: Makefile.am,v 1.63 2007-02-26 11:40:03 marc Exp $
+## $Id: Makefile.am,v 1.67 2008-02-27 11:08:49 adam Exp $
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
-AM_CXXFLAGS = $(YAZPPINC) $(BOOST_CPPFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_LDFLAGS = $(BOOST_LDFLAGS) \
-            $(BOOST_DATE_TIME_LIB) \
-            $(BOOST_PROGRAM_OPTIONS_LIB) \
-            $(BOOST_THREAD_LIB) \
-            $(YAZPPLALIB)
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 EXTRA_DIST=Jamfile.in
 
@@ -53,7 +49,10 @@ libmetaproxy_la_SOURCES = \
 
 # Rules for programs..
 
-LDADD= libmetaproxy.la
+LDADD = libmetaproxy.la \
+       $(YAZPPLALIB) \
+       $(BOOST_DATE_TIME_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
@@ -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)