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

diff --git a/src/Makefile.am b/src/Makefile.am
index ba5da16..2940fd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,13 @@
-## $Id: Makefile.am,v 1.60 2006-12-28 14:59:44 marc Exp $
+## This file is part of Metaproxy
+## Copyright (C) 2005-2010 Index Data
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
-AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-EXTRA_DIST=Jamfile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+AM_LDFLAGS =
 
 # Rules for the library..
 
@@ -14,12 +17,15 @@ libmetaproxy_la_LDFLAGS = -version-info 1:0:0 -export-dynamic
 libmetaproxy_la_SOURCES = \
 	factory_filter.cpp factory_filter.hpp \
 	factory_static.cpp factory_static.hpp \
-	filter.hpp filter.cpp \
+	filter.cpp \
 	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_limit.cpp filter_limit.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 \
@@ -31,21 +37,24 @@ libmetaproxy_la_SOURCES = \
 	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 \
+	origin.cpp \
+	package.cpp \
 	pipe.cpp pipe.hpp \
 	plainfile.cpp \
-	router.hpp router_chain.hpp router_chain.cpp \
+	router_chain.hpp router_chain.cpp \
         router_flexml.hpp router_flexml.cpp \
-	session.cpp session.hpp \
+	session.cpp \
 	sru_util.cpp sru_util.hpp \
 	thread_pool_observer.cpp thread_pool_observer.hpp \
-	util.cpp util.hpp \
-	xmlutil.cpp xmlutil.hpp
+	util.cpp \
+	xmlutil.cpp 
+
+
+libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
 
-# Rules for programs..
+# 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 +79,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 +104,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 +120,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 +129,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)