From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 15 May 2013 08:05:23 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.56~10
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=541dca64a8e7b495045a8ac4068f8e15eb12b303;hp=-c;p=metaproxy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
---

541dca64a8e7b495045a8ac4068f8e15eb12b303
diff --combined src/Makefile.am
index 8e3bbeb,d0ffacc..08aa695
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -12,14 -12,11 +12,14 @@@ AM_CPPFLAGS = -I$(top_srcdir)/include $
  bin_SCRIPTS = metaproxy-config
  
  filter_src = \
 +	factory_filter.cpp factory_filter.hpp \
 +	factory_static.cpp factory_static.hpp \
  	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_client.cpp filter_http_client.hpp \
  	filter_http_file.cpp filter_http_file.hpp \
  	filter_http_rewrite1.cpp filter_http_rewrite1.hpp \
@@@ -28,9 -25,9 +28,10 @@@
  	filter_log.cpp filter_log.hpp \
  	filter_multi.cpp filter_multi.hpp \
  	filter_query_rewrite.cpp filter_query_rewrite.hpp \
+ 	filter_present_chunk.cpp filter_present_chunk.hpp \
  	filter_record_transform.cpp filter_record_transform.hpp \
  	filter_session_shared.cpp filter_session_shared.hpp \
 +	filter_sd_remove.cpp filter_sd_remove.hpp \
  	filter_sort.cpp filter_sort.hpp \
          filter_sru_to_z3950.cpp  filter_sru_to_z3950.hpp \
  	filter_template.cpp filter_template.hpp \
@@@ -38,19 -35,23 +39,19 @@@
  	filter_z3950_client.cpp filter_z3950_client.hpp \
  	filter_zeerex_explain.cpp  filter_zeerex_explain.hpp \
  	filter_zoom.cpp filter_zoom.hpp \
 -	filter_frontend_net.cpp filter_frontend_net.hpp \
 -	filter_sd_remove.cpp filter_sd_remove.hpp
 +	router_chain.hpp router_chain.cpp \
 +        router_flexml.hpp router_flexml.cpp
  
  lib_LTLIBRARIES = libmetaproxy.la
  libmetaproxy_la_LDFLAGS = -version-info 4:0:0 -export-dynamic
  
  libmetaproxy_la_SOURCES = \
 -	factory_filter.cpp factory_filter.hpp \
 -	factory_static.cpp factory_static.hpp \
  	filter.cpp \
  	gduutil.cpp gduutil.hpp \
  	origin.cpp \
  	package.cpp \
  	pipe.cpp pipe.hpp \
  	plainfile.cpp \
 -	router_chain.hpp router_chain.cpp \
 -        router_flexml.hpp router_flexml.cpp \
  	session.cpp \
  	sru_util.cpp sru_util.hpp \
  	thread_pool_observer.cpp thread_pool_observer.hpp \
@@@ -112,14 -113,14 +113,14 @@@ TESTS=$(check_PROGRAMS
  
  test_package1_SOURCES=test_package1.cpp
  test_pipe_SOURCES=test_pipe.cpp
 -test_filter1_SOURCES=test_filter1.cpp
 -test_filter2_SOURCES=test_filter2.cpp
 +test_filter1_SOURCES=test_filter1.cpp $(filter_src)
 +test_filter2_SOURCES=test_filter2.cpp $(filter_src)
  test_session1_SOURCES=test_session1.cpp
  test_session2_SOURCES=test_session2.cpp
  test_boost_threads_SOURCES=test_boost_threads.cpp
  test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp
  test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp $(filter_src)
 -test_filter_factory_SOURCES = test_filter_factory.cpp
 +test_filter_factory_SOURCES = test_filter_factory.cpp $(filter_src)
  test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp $(filter_src)
  test_filter_log_SOURCES = test_filter_log.cpp $(filter_src)
  test_filter_multi_SOURCES = test_filter_multi.cpp $(filter_src)