X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2FMakefile.am;h=021dc3dfb3f734de3229a968ae299b21b39aa82d;hb=cf09b1981338f07c333e43e0a2c907012c841c5d;hp=42e729f1616fe10cd7bbe2ab741ffc0419f1d1a8;hpb=2a00c5af9a7d64b295de71709ad65f1c1a21154a;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 42e729f..021dc3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,48 +1,75 @@
-## $Id: Makefile.am,v 1.14 2005-10-12 20:45:56 marc Exp $
-
-MAINTAINERCLEANFILES    = Makefile.in config.in config.hpp
+## $Id: Makefile.am,v 1.24 2005-10-25 11:48:30 adam Exp $
 
+MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
 AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
 
-YP2_INCHPP = session.hpp package.hpp filter.hpp router.hpp
+# Rules for the library..
 
-bin_PROGRAMS =
-check_PROGRAMS = test_filter1 test_filter2 \
-                 test_session1 test_session2 \
-                 test_thread_pool_observer test_boost_threads test_boost_time
-noinst_PROGRAMS =  p2 
+lib_LTLIBRARIES = libyp2.la
+libyp2_la_LDFLAGS = -version-info 0:0:0
 
-TESTS=$(check_PROGRAMS)
+libyp2_la_SOURCES = \
+	session.cpp session.hpp package.hpp filter.hpp router.hpp \
+	thread_pool_observer.cpp thread_pool_observer.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
 
-test_filter1_SOURCES=test_filter1.cpp $(YP2_INCHPP)
-test_filter2_SOURCES=test_filter2.cpp $(YP2_INCHPP)
-test_session1_SOURCES=test_session1.cpp $(YP2_INCHPP)
-test_session2_SOURCES=test_session2.cpp $(YP2_INCHPP)
-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 \
-          thread_pool_observer.cpp thread_pool_observer.h
+# Rules for programs..
 
-p2_SOURCES=p2_frontend.cpp p2_msg.cpp p2.cpp p2_frontend.h \
- p2_config.cpp p2_config.h \
- p2_backend.h p2_backend_dummy.cpp \
- p2_modules.cpp p2_modules.h \
- p2_xmlerror.cpp p2_xmlerror.h \
- thread_pool_observer.cpp thread_pool_observer.h
+LDADD= libyp2.la $(YAZPPLALIB) $(XSLT_LIBS)
 
+bin_PROGRAMS =
+noinst_PROGRAMS = ex_filter_frontend_net ex_libxml2_conf
 
-LDADD= $(YAZPPLALIB) $(XSLT_LIBS)
+ex_filter_frontend_net_SOURCES = ex_filter_frontend_net.cpp
+ex_libxml2_conf_SOURCES = ex_libxml2_conf.cpp
 
-test_filter1_LDADD = $(LDADD) -lboost_unit_test_framework
-test_filter2_LDADD = $(LDADD) -lboost_unit_test_framework
-test_session1_LDADD = $(LDADD) -lboost_unit_test_framework
-test_session2_LDADD = $(LDADD) -lboost_unit_test_framework
-test_boost_threads_LDADD = $(LDADD) -lboost_unit_test_framework
-test_boost_time_LDADD = $(LDADD) -lboost_unit_test_framework
+# Rules for test programs..
 
+check_PROGRAMS = \
+	test_package1 \
+	test_filter1 test_filter2 \
+	test_session1 test_session2 \
+	test_thread_pool_observer \
+	test_boost_threads test_boost_time \
+	test_filter_frontend_net \
+	test_filter_log \
+	test_filter_z3950_client \
+	test_filter_virt_db
 
+TESTS=$(check_PROGRAMS)
 
+test_package1_SOURCES=test_package1.cpp
+test_filter1_SOURCES=test_filter1.cpp
+test_filter2_SOURCES=test_filter2.cpp
+test_session1_SOURCES=test_session1.cpp
+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_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
+test_filter_virt_db_SOURCES = test_filter_virt_db.cpp
+
+TESTLDADD = $(LDADD) -lboost_unit_test_framework
+
+test_filter1_LDADD = $(TESTLDADD)
+test_filter2_LDADD = $(TESTLDADD)
+test_session1_LDADD = $(TESTLDADD)
+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_frontend_net_LDADD = $(TESTLDADD)
+test_filter_log_LDADD = $(TESTLDADD)
+test_filter_z3950_client_LDADD = $(TESTLDADD)
+test_filter_virt_db_LDADD = $(TESTLDADD)
 
 # doxygen target
 dox: