X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=src%2FMakefile.am;h=2fd787827ae30bf7ab28269140adff6ef0821923;hb=58556d445148f40d65dbfee9f87ddae009d08cae;hp=e7e54f0b7351aaedeed16664cae8bcbd79a133ab;hpb=c1d953eee6c00432493bc364da6284704ccd9cc2;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index e7e54f0..2fd7878 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,9 @@ 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_limit.cpp filter_limit.hpp \
 	filter_load_balance.cpp filter_load_balance.hpp \
 	filter_log.cpp filter_log.hpp \
@@ -36,11 +38,13 @@ 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 \
 	filter_z3950_client.cpp filter_z3950_client.hpp \
 	filter_zeerex_explain.cpp  filter_zeerex_explain.hpp \
+	filter_zoom.cpp filter_zoom.hpp \
 	gduutil.cpp gduutil.hpp \
 	origin.cpp \
 	package.cpp \
@@ -51,15 +55,18 @@ libmetaproxy_la_SOURCES = \
 	session.cpp \
 	sru_util.cpp sru_util.hpp \
 	thread_pool_observer.cpp thread_pool_observer.hpp \
+	torus.cpp torus.hpp \
+	url_recipe.cpp \
 	util.cpp \
 	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
@@ -98,7 +105,8 @@ check_PROGRAMS = \
 	test_filter_sru_to_z3950 \
 	test_filter_virt_db \
 	test_ses_map \
-	test_router_flexml
+	test_router_flexml \
+	test_xmlutil
 
 TESTS=$(check_PROGRAMS)
 
@@ -124,6 +132,7 @@ 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
+test_xmlutil_SOURCES = test_xmlutil.cpp
 
 TESTLDADD = $(LDADD) $(BOOST_TEST_LIB)
 
@@ -149,6 +158,7 @@ test_filter_virt_db_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: