X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2FMakefile.am;h=8644b6abeac59215fe4a887e1acd7830ae9e8a6f;hb=ddef5183e8d66d71d9ded936a0c68b947d7804e0;hp=197c06a6ed1273e54374fa8b24f316e2091b0086;hpb=cae80f85741d2564d918a0e3285c62e51491a7fc;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 197c06a..8644b6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.38 2005-12-10 09:59:10 adam Exp $
+## $Id: Makefile.am,v 1.49 2006-02-02 13:08:22 adam Exp $
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
@@ -12,32 +12,41 @@ lib_LTLIBRARIES = libyp2.la
 libyp2_la_LDFLAGS = -version-info 0:0:0 -export-dynamic
 
 libyp2_la_SOURCES = \
-	session.cpp session.hpp \
-	package.cpp package.hpp \
-	router.hpp router_chain.hpp router_chain.cpp \
-        router_flexml.hpp router_flexml.cpp \
-	thread_pool_observer.cpp thread_pool_observer.hpp \
-	filter.hpp filter.cpp filter_factory.cpp filter_factory.hpp \
+	factory_filter.cpp factory_filter.hpp \
+	factory_static.cpp factory_static.hpp \
+	filter.hpp filter.cpp \
+	filter_auth_simple.cpp filter_auth_simple.hpp \
+	filter_backend_test.cpp filter_backend_test.hpp \
 	filter_frontend_net.cpp filter_frontend_net.hpp \
+	filter_http_file.cpp filter_http_file.hpp \
 	filter_log.cpp filter_log.hpp \
-	filter_virt_db.cpp filter_virt_db.hpp \
-	filter_z3950_client.cpp filter_z3950_client.hpp \
-	filter_backend_test.cpp filter_backend_test.hpp \
+	filter_multi.cpp filter_multi.hpp \
+	filter_query_rewrite.cpp filter_query_rewrite.hpp \
 	filter_session_shared.cpp filter_session_shared.hpp \
 	filter_template.cpp filter_template.hpp \
+	filter_virt_db.cpp filter_virt_db.hpp \
+	filter_z3950_client.cpp filter_z3950_client.hpp \
+	package.cpp package.hpp \
 	pipe.cpp pipe.hpp \
-	util.cpp util.hpp
+	plainfile.cpp \
+	router.hpp router_chain.hpp router_chain.cpp \
+        router_flexml.hpp router_flexml.cpp \
+	session.cpp session.hpp \
+	thread_pool_observer.cpp thread_pool_observer.hpp \
+	util.cpp util.hpp \
+	xmlutil.cpp xmlutil.hpp
 
 # Rules for programs..
 
 LDADD= libyp2.la $(YAZPPLALIB) $(XSLT_LIBS)
 
-bin_PROGRAMS =
+bin_PROGRAMS = yp2
 noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
 
 ex_filter_frontend_net_SOURCES = ex_filter_frontend_net.cpp
 ex_router_flexml_SOURCES =  ex_router_flexml.cpp
 tstdl_SOURCES = tstdl.cpp
+yp2_SOURCES = yp2_prog.cpp
 
 # Rules for dl programs
 pkglib_LTLIBRARIES = yp2_filter_dl.la
@@ -55,9 +64,11 @@ check_PROGRAMS = \
 	test_session1 test_session2 \
 	test_thread_pool_observer \
 	test_boost_threads test_boost_time \
+	test_filter_auth_simple \
 	test_filter_factory \
 	test_filter_frontend_net \
 	test_filter_log \
+	test_filter_multi \
 	test_filter_z3950_client \
 	test_filter_backend_test \
 	test_filter_virt_db \
@@ -75,10 +86,12 @@ test_session2_SOURCES=test_session2.cpp
 test_boost_threads_SOURCES=test_boost_threads.cpp
 test_boost_time_SOURCES=test_boost_time.cpp
 test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp
+test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp
 test_filter_factory_SOURCES = test_filter_factory.cpp
-test_filter_factory_LDFLAGS = -export-dynamic
 test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp
 test_filter_log_SOURCES = test_filter_log.cpp
+test_filter_multi_SOURCES = test_filter_multi.cpp
+test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp
 test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp
 test_filter_backend_test_SOURCES = test_filter_backend_test.cpp
 test_filter_virt_db_SOURCES = test_filter_virt_db.cpp
@@ -96,9 +109,12 @@ test_session2_LDADD = $(TESTLDADD)
 test_boost_threads_LDADD = $(TESTLDADD)
 test_boost_time_LDADD = $(TESTLDADD)
 test_thread_pool_observer_LDADD = $(TESTLDADD)
+test_filter_auth_simple_LDADD = $(TESTLDADD)
 test_filter_factory_LDADD = $(TESTLDADD)
 test_filter_frontend_net_LDADD = $(TESTLDADD)
 test_filter_log_LDADD = $(TESTLDADD)
+test_filter_multi_LDADD = $(TESTLDADD)
+test_filter_query_rewrite_LDADD = $(TESTLDADD)
 test_filter_z3950_client_LDADD = $(TESTLDADD)
 test_filter_backend_test_LDADD = $(TESTLDADD)
 test_filter_virt_db_LDADD = $(TESTLDADD)