X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=47a7b526773d3f8e33a35e814384f5dbaf64c622;hb=e70af82aac79f1313b235417da3fc6d592f96e5f;hp=903c637de078e33ed75e0f6f8385c493a4f02649;hpb=a5fe7e6104de3fccbbbe7cb57253b261b0ac6ecc;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 903c637..47a7b52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## This file is part of Metaproxy
-## Copyright (C) 2005-2011 Index Data
+## Copyright (C) 2005-2013 Index Data
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
@@ -7,7 +7,7 @@ DISTCLEANFILES = metaproxy-config
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include $(USEMARCONINC)
 
 AM_LDFLAGS =
 
@@ -16,7 +16,7 @@ bin_SCRIPTS = metaproxy-config
 # Rules for the library..
 
 lib_LTLIBRARIES = libmetaproxy.la
-libmetaproxy_la_LDFLAGS = -version-info 3:0:0 -export-dynamic
+libmetaproxy_la_LDFLAGS = -version-info 4:0:0 -export-dynamic
 
 libmetaproxy_la_SOURCES = \
 	factory_filter.cpp factory_filter.hpp \
@@ -28,7 +28,10 @@ libmetaproxy_la_SOURCES = \
 	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 \
+	filter_http_rewrite.cpp filter_http_rewrite.hpp \
 	filter_limit.cpp filter_limit.hpp \
 	filter_load_balance.cpp filter_load_balance.hpp \
 	filter_log.cpp filter_log.hpp \
@@ -36,6 +39,7 @@ libmetaproxy_la_SOURCES = \
 	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_sort.cpp filter_sort.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 \
@@ -58,11 +62,12 @@ libmetaproxy_la_SOURCES = \
 	xmlutil.cpp 
 
 
-libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
+libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) $(BOOST_REGEX_LIB)
 
 # Rules for lib
 
-LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB)
+LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) \
+	$(BOOST_REGEX_LIB) $(USEMARCONLALIB)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -100,8 +105,10 @@ check_PROGRAMS = \
 	test_filter_record_transform \
 	test_filter_sru_to_z3950 \
 	test_filter_virt_db \
+	test_filter_rewrite \
 	test_ses_map \
-	test_router_flexml
+	test_router_flexml \
+	test_xmlutil
 
 TESTS=$(check_PROGRAMS)
 
@@ -125,8 +132,10 @@ 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_filter_rewrite_SOURCES = test_filter_rewrite.cpp
 test_ses_map_SOURCES = test_ses_map.cpp
 test_router_flexml_SOURCES = test_router_flexml.cpp
+test_xmlutil_SOURCES = test_xmlutil.cpp
 
 TESTLDADD = $(LDADD) $(BOOST_TEST_LIB)
 
@@ -149,9 +158,11 @@ 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_filter_rewrite_LDADD = $(TESTLDADD)
 test_router_flexml_LDADD = $(TESTLDADD)
 test_ses_map_LDADD = $(TESTLDADD)
 test_thread_pool_observer_LDADD = $(TESTLDADD)
+test_xmlutil_LDADD = $(TESTLDADD)
 
 # doxygen target
 dox: