X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=fb3fc31bf6a3509b132a6db52f1fd59c179353b6;hb=13ededc67712ac2ecb30677b016b3f6cf4ad4eab;hp=7f6756fdb7ab84c25be02b6e85532c5b5d27a71b;hpb=dd6954fd5ae7c0bd90df8869f2351a72ee363440;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 7f6756f..fb3fc31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,13 @@
 ## This file is part of Metaproxy
-## Copyright (C) 2005-2010 Index Data
+## Copyright (C) 2005-2012 Index Data
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
+DISTCLEANFILES = metaproxy-config
+
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include $(USEMARCONINC)
 
 AM_LDFLAGS =
 
@@ -14,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 \
@@ -39,6 +41,7 @@ libmetaproxy_la_SOURCES = \
 	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 \
@@ -49,15 +52,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
@@ -96,7 +102,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)
 
@@ -122,6 +129,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)
 
@@ -147,6 +155,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: