X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2FMakefile.am;h=4aca39e90813fd0b4fc6f203dceff0dcc22222cc;hb=c4acf512739b0efda858ce209dc5bedfa2b7d3c1;hp=05dc669631b927a3a3fa281482852213eea11622;hpb=e637fc7750457b84b070b71e009c733887b0dd73;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 05dc669..4aca39e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,10 @@
-## $Id: Makefile.am,v 1.59 2006-10-03 14:04:22 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) $(XSLT_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS)
+
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 EXTRA_DIST=Jamfile.in
 
@@ -18,8 +20,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 \
@@ -29,6 +33,7 @@ libmetaproxy_la_SOURCES = \
 	filter_template.cpp filter_template.hpp \
 	filter_virt_db.cpp filter_virt_db.hpp \
 	filter_z3950_client.cpp filter_z3950_client.hpp \
+	filter_zeerex_explain.cpp  filter_zeerex_explain.hpp \
 	gduutil.cpp gduutil.hpp \
 	origin.cpp origin.hpp \
 	package.cpp package.hpp \
@@ -44,7 +49,11 @@ libmetaproxy_la_SOURCES = \
 
 # Rules for programs..
 
-LDADD= libmetaproxy.la $(YAZPPLALIB) $(XSLT_LIBS)
+LDADD = libmetaproxy.la \
+	$(YAZPPLALIB) \
+	$(BOOST_DATE_TIME_LIB) \
+	$(BOOST_PROGRAM_OPTIONS_LIB) \
+	$(BOOST_THREAD_LIB)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -69,7 +78,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 \
@@ -94,7 +103,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
@@ -111,7 +119,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_UNIT_TEST_FRAMEWORK_LIB)
 
 test_package1_LDADD = $(TESTLDADD)
 test_pipe_LDADD = $(TESTLDADD)
@@ -120,7 +128,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)