X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=c2fe706445158c9bf2303779b029f6c03e0bed64;hb=8c9c3b0f7bf85453c42e418f4a740d570f2189c1;hp=8448fa3b2dff3f73483b0133a03816c9011c13e4;hpb=d0123337d70b0fb97b578cc57467bb94980f1014;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 8448fa3..c2fe706 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,35 @@
 ## This file is part of Metaproxy
-## Copyright (C) 2005-2009 Index Data
+## Copyright (C) 2005-2011 Index Data
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
+DISTCLEANFILES = metaproxy-config
+
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
 AM_LDFLAGS =
 
-EXTRA_DIST=Jamfile.in
+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 4: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 \
@@ -35,24 +41,28 @@ 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 origin.hpp \
-	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
+	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)
 
 bin_PROGRAMS = metaproxy
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
@@ -91,7 +101,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)
 
@@ -117,6 +128,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)
 
@@ -142,6 +154,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: