X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=c369ae812e0c414c4e0c80c6c1edd10ea256a3c8;hb=ddc156360c0c46ef669accde05fea1106cc6b244;hp=b3fa8c049fee419c6281e43cdc4ee03ba9ecee2c;hpb=451ffea184560b0d10f369dfc3fccb0fa86b91a2;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index b3fa8c0..c369ae8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,11 @@
-## $Id: Makefile.am,v 1.61 2007-01-02 15:35:36 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,6 +21,7 @@ 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 \
@@ -42,11 +46,14 @@ libmetaproxy_la_SOURCES = \
 	sru_util.cpp sru_util.hpp \
 	thread_pool_observer.cpp thread_pool_observer.hpp \
 	util.cpp util.hpp \
-	xmlutil.cpp xmlutil.hpp
+	xmlutil.cpp xmlutil.hpp \
+	filter_limit.cpp filter_limit.hpp
+
+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
@@ -71,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 \
@@ -96,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
@@ -113,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_TEST_LIB)
 
 test_package1_LDADD = $(TESTLDADD)
 test_pipe_LDADD = $(TESTLDADD)
@@ -122,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)