Depend on yazpp 1.1.4

[metaproxy-moved-to-github.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f3bfb0a..84af9b2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,11 @@
-## $Id: Makefile.am,v 1.67 2008-02-27 11:08:49 adam Exp $
+## This file is part of Metaproxy
+## Copyright (C) 2005-2009 Index Data
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_LDFLAGS = $(BOOST_LDFLAGS)
-
-EXTRA_DIST=Jamfile.in
+AM_LDFLAGS =
 
 # Rules for the library..
 
@@ -23,6 +22,7 @@ libmetaproxy_la_SOURCES = \
        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 \
@@ -47,12 +47,12 @@ libmetaproxy_la_SOURCES = \
        util.cpp util.hpp \
        xmlutil.cpp xmlutil.hpp
 
-# Rules for programs..
 
-LDADD = libmetaproxy.la \
-       $(YAZPPLALIB) \
-       $(BOOST_DATE_TIME_LIB) \
-       $(BOOST_THREAD_LIB)
+libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
+
+# Rules for lib
+
+LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -118,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) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+TESTLDADD = $(LDADD) $(BOOST_TEST_LIB)
 
 test_package1_LDADD = $(TESTLDADD)
 test_pipe_LDADD = $(TESTLDADD)