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

diff --git a/src/Makefile.am b/src/Makefile.am
index ba5da16..8448fa3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,11 @@
-## $Id: Makefile.am,v 1.60 2006-12-28 14:59:44 marc Exp $
+## This file is part of Metaproxy
+## Copyright (C) 2005-2009 Index Data
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
-AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS)
+
+AM_LDFLAGS =
 
 EXTRA_DIST=Jamfile.in
 
@@ -18,8 +21,10 @@ libmetaproxy_la_SOURCES = \
 	filter_auth_simple.cpp filter_auth_simple.hpp \
 	filter_backend_test.cpp filter_backend_test.hpp \
 	filter_bounce.cpp filter_bounce.hpp \
+	filter_cql_to_rpn.cpp filter_cql_to_rpn.hpp \
 	filter_frontend_net.cpp filter_frontend_net.hpp \
 	filter_http_file.cpp filter_http_file.hpp \
+	filter_load_balance.cpp filter_load_balance.hpp \
 	filter_log.cpp filter_log.hpp \
 	filter_multi.cpp filter_multi.hpp \
 	filter_query_rewrite.cpp filter_query_rewrite.hpp \
@@ -43,9 +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)
+
+# Rules for lib
 
-LDADD= libmetaproxy.la $(YAZPPLALIB) $(XSLT_LIBS)
+LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -70,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 \
@@ -95,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
@@ -112,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) -lboost_unit_test_framework
+TESTLDADD = $(LDADD) $(BOOST_TEST_LIB)
 
 test_package1_LDADD = $(TESTLDADD)
 test_pipe_LDADD = $(TESTLDADD)
@@ -121,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)