X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2FMakefile.am;h=d3924c1910813baa242fa0ae4e7d85cb5682af37;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=30286b297b74597ef19f18e8720bf46d0cf0402e;hpb=b54482cdb759f092fcd07a9be4fdc8c28009b895;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 30286b2..d3924c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,24 +1,31 @@
-## $Id: Makefile.am,v 1.29 2005-10-26 18:53:49 adam Exp $
+## $Id: Makefile.am,v 1.37 2005-12-02 12:21:07 adam Exp $
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
 AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
 
+EXTRA_DIST=Jamfile.in
+
 # Rules for the library..
 
 lib_LTLIBRARIES = libyp2.la
 libyp2_la_LDFLAGS = -version-info 0:0:0
 
 libyp2_la_SOURCES = \
-	session.cpp session.hpp package.hpp filter.hpp\
+	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 \
 	filter_frontend_net.cpp filter_frontend_net.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_session_shared.cpp filter_session_shared.hpp \
+	filter_template.cpp filter_template.hpp \
+	pipe.cpp pipe.hpp \
 	util.cpp util.hpp
 
 # Rules for programs..
@@ -26,19 +33,20 @@ libyp2_la_SOURCES = \
 LDADD= libyp2.la $(YAZPPLALIB) $(XSLT_LIBS)
 
 bin_PROGRAMS =
-noinst_PROGRAMS = ex_filter_frontend_net ex_libxml2_conf ex_router_flexml
+noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml
 
 ex_filter_frontend_net_SOURCES = ex_filter_frontend_net.cpp
-ex_libxml2_conf_SOURCES = ex_libxml2_conf.cpp
 ex_router_flexml_SOURCES =  ex_router_flexml.cpp
 # Rules for test programs..
 
 check_PROGRAMS = \
 	test_package1 \
+	test_pipe \
 	test_filter1 test_filter2 \
 	test_session1 test_session2 \
 	test_thread_pool_observer \
 	test_boost_threads test_boost_time \
+	test_filter_factory \
 	test_filter_frontend_net \
 	test_filter_log \
 	test_filter_z3950_client \
@@ -50,6 +58,7 @@ check_PROGRAMS = \
 TESTS=$(check_PROGRAMS)
 
 test_package1_SOURCES=test_package1.cpp
+test_pipe_SOURCES=test_pipe.cpp
 test_filter1_SOURCES=test_filter1.cpp
 test_filter2_SOURCES=test_filter2.cpp
 test_session1_SOURCES=test_session1.cpp
@@ -57,6 +66,7 @@ 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_factory_SOURCES = test_filter_factory.cpp
 test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp
 test_filter_log_SOURCES = test_filter_log.cpp
 test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp
@@ -67,6 +77,8 @@ test_router_flexml_SOURCES = test_router_flexml.cpp
 
 TESTLDADD = $(LDADD) -lboost_unit_test_framework
 
+test_package1_LDADD = $(TESTLDADD)
+test_pipe_LDADD = $(TESTLDADD)
 test_filter1_LDADD = $(TESTLDADD)
 test_filter2_LDADD = $(TESTLDADD)
 test_session1_LDADD = $(TESTLDADD)
@@ -74,7 +86,7 @@ test_session2_LDADD = $(TESTLDADD)
 test_boost_threads_LDADD = $(TESTLDADD)
 test_boost_time_LDADD = $(TESTLDADD)
 test_thread_pool_observer_LDADD = $(TESTLDADD)
-test_package1_LDADD = $(TESTLDADD)
+test_filter_factory_LDADD = $(TESTLDADD)
 test_filter_frontend_net_LDADD = $(TESTLDADD)
 test_filter_log_LDADD = $(TESTLDADD)
 test_filter_z3950_client_LDADD = $(TESTLDADD)