X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=a79addeca316350d37dd5676f24c52b5490b700d;hb=9316cb3fad1eabba58505601dc1c4636ea0492dc;hp=3a115acea353a136c512c1bffa77e99ffd759ae1;hpb=daae7f857790a8826c1db2f0452c0a7d0ebb15e5;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 3a115ac..a79adde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,45 +1,65 @@
-## $Id: Makefile.am,v 1.52 2006-08-30 10:48:52 adam 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)
+DISTCLEANFILES = metaproxy-config
 
-EXTRA_DIST=Jamfile.in
+AM_CXXFLAGS = $(BOOST_CPPFLAGS)
+
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+AM_LDFLAGS =
+
+bin_SCRIPTS = metaproxy-config
 
 # Rules for the library..
 
 lib_LTLIBRARIES = libmetaproxy.la
-libmetaproxy_la_LDFLAGS = -version-info 1:0:0 -export-dynamic
+libmetaproxy_la_LDFLAGS = -version-info 3: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_cgi.cpp filter_cgi.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 \
+	filter_record_transform.cpp filter_record_transform.hpp \
 	filter_session_shared.cpp filter_session_shared.hpp \
+        filter_sru_to_z3950.cpp  filter_sru_to_z3950.hpp \
 	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 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
@@ -64,7 +84,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 \
@@ -73,6 +93,9 @@ check_PROGRAMS = \
 	test_filter_query_rewrite \
 	test_filter_z3950_client \
 	test_filter_backend_test \
+	test_filter_bounce \
+	test_filter_record_transform \
+	test_filter_sru_to_z3950 \
 	test_filter_virt_db \
 	test_ses_map \
 	test_router_flexml
@@ -86,7 +109,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
@@ -96,11 +118,14 @@ test_filter_multi_SOURCES = test_filter_multi.cpp
 test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp
 test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp
 test_filter_backend_test_SOURCES = test_filter_backend_test.cpp
+test_filter_bounce_SOURCES = test_filter_bounce.cpp
+test_filter_record_transform_SOURCES = test_filter_record_transform.cpp
+test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp
 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)
@@ -109,8 +134,6 @@ test_filter2_LDADD = $(TESTLDADD)
 test_session1_LDADD = $(TESTLDADD)
 test_session2_LDADD = $(TESTLDADD)
 test_boost_threads_LDADD = $(TESTLDADD)
-test_boost_time_LDADD = $(TESTLDADD)
-test_thread_pool_observer_LDADD = $(TESTLDADD)
 test_filter_auth_simple_LDADD = $(TESTLDADD)
 test_filter_factory_LDADD = $(TESTLDADD)
 test_filter_frontend_net_LDADD = $(TESTLDADD)
@@ -119,9 +142,13 @@ test_filter_multi_LDADD = $(TESTLDADD)
 test_filter_query_rewrite_LDADD = $(TESTLDADD)
 test_filter_z3950_client_LDADD = $(TESTLDADD)
 test_filter_backend_test_LDADD = $(TESTLDADD)
+test_filter_bounce_LDADD = $(TESTLDADD)
+test_filter_record_transform_LDADD = $(TESTLDADD)
+test_filter_sru_to_z3950_LDADD = $(TESTLDADD)
 test_filter_virt_db_LDADD = $(TESTLDADD)
-test_ses_map_LDADD = $(TESTLDADD)
 test_router_flexml_LDADD = $(TESTLDADD)
+test_ses_map_LDADD = $(TESTLDADD)
+test_thread_pool_observer_LDADD = $(TESTLDADD)
 
 # doxygen target
 dox: