X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2FMakefile.am;h=881230f6098239d51309b86a2c15f7045c1121aa;hb=517e528f09d1f80ccc4948f9d38eeb79f8501975;hp=b3fa8c049fee419c6281e43cdc4ee03ba9ecee2c;hpb=451ffea184560b0d10f369dfc3fccb0fa86b91a2;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index b3fa8c0..881230f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,14 @@
-## $Id: Makefile.am,v 1.61 2007-01-02 15:35:36 marc Exp $
+## $Id: Makefile.am,v 1.64 2007-02-26 13:31:00 adam Exp $
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
-AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
+AM_CXXFLAGS = $(BOOST_CPPFLAGS)
+
+AM_LDFLAGS = $(BOOST_LDFLAGS) \
+            $(BOOST_DATE_TIME_LIB) \
+            $(BOOST_PROGRAM_OPTIONS_LIB) \
+            $(BOOST_THREAD_LIB) \
+            $(YAZPPLALIB)
 
 EXTRA_DIST=Jamfile.in
 
@@ -18,6 +24,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 \
@@ -46,7 +53,7 @@ libmetaproxy_la_SOURCES = \
 
 # Rules for programs..
 
-LDADD= libmetaproxy.la $(YAZPPLALIB) $(XSLT_LIBS)
+LDADD= libmetaproxy.la
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -113,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_UNIT_TEST_FRAMEWORK_LIB)
 
 test_package1_LDADD = $(TESTLDADD)
 test_pipe_LDADD = $(TESTLDADD)