X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=0f2d0c71d7536d61fbb90b184f7b9ca7b4df3236;hb=283537fd130e56aa77410b47092dea16be47b108;hp=c650337353a64f55d1c75266c615131a20850624;hpb=c64f3428802f61a7f087e410d9d0972f5a805f65;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index c650337..0f2d0c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,35 +1,50 @@
-## $Id: Makefile.am,v 1.1 2005-10-06 09:37:25 marc Exp $
+## $Id: Makefile.am,v 1.15 2005-10-12 23:30:43 adam Exp $
 
-AM_CXXFLAGS = $(YAZPPINC) -I$(srcdir)/../include $(XSLT_CFLAGS) $(USEMARCONINC)
+MAINTAINERCLEANFILES    = Makefile.in config.in config.hpp
 
-lib_LTLIBRARIES = libyazproxy.la
-libyazproxy_la_LDFLAGS=-version-info 1:0:0
 
-libyazproxy_la_SOURCES= yaz-proxy.cpp yaz-proxy-config.cpp yaz-bw.cpp \
- proxyp.h yaz-usemarcon.cpp charset-converter.cpp msg-thread.cpp msg-thread.h \
- modules.cpp
+AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
 
-bin_PROGRAMS = yazproxy
-check_PROGRAMS = cdetails
-noinst_PROGRAMS = tstthreads t-server p2
+YP2_INCHPP = session.hpp package.hpp filter.hpp router.hpp
+
+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 
 
 TESTS=$(check_PROGRAMS)
 
-yazproxy_SOURCES=yaz-proxy-main.cpp
-cdetails_SOURCES=cdetails.cpp
-tstthreads_SOURCES=tstthreads.cpp
-t_server_SOURCES=t-server.cpp
+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
+
 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
+ p2_xmlerror.cpp p2_xmlerror.h \
+ thread_pool_observer.cpp thread_pool_observer.h
+
+
+LDADD= $(YAZPPLALIB) $(XSLT_LIBS)
 
-LDADD=libyazproxy.la $(YAZPPLALIB) $(XSLT_LIBS) $(USEMARCONLALIB)
-libyazproxy_la_LIBADD = $(XSLT_LIBS)
+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
+test_thread_pool_observer_LDADD = $(LDADD) -lboost_unit_test_framework
 
-# Modules
-mod_proxy_sample_la_SOURCES = mod_sample.cpp
-mod_proxy_sample_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
+# doxygen target
+dox:
+	(cd $(top_srcdir) ; make dox) 
 
-pkglib_LTLIBRARIES = mod_proxy_sample.la
+showdox:
+	(cd $(top_srcdir) ; make showdox)