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

diff --git a/src/Makefile.am b/src/Makefile.am
index c650337..1587d49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,35 +1,68 @@
-## $Id: Makefile.am,v 1.1 2005-10-06 09:37:25 marc Exp $
+## $Id: Makefile.am,v 1.17 2005-10-13 20:06:45 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
+AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
 
-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
+# Rules for the library..
 
-bin_PROGRAMS = yazproxy
-check_PROGRAMS = cdetails
-noinst_PROGRAMS = tstthreads t-server p2
+lib_LTLIBRARIES = libyp2.la
+libyp2_la_LDFLAGS = -version-info 0:0:0
 
-TESTS=$(check_PROGRAMS)
+libyp2_la_SOURCES = filter_frontend_net.cpp filter_frontend_net.hpp \
+	session.cpp session.hpp package.hpp filter.hpp router.hpp \
+	thread_pool_observer.cpp thread_pool_observer.hpp
+
+# Rules for programs..
+
+LDADD= libyp2.la $(YAZPPLALIB) $(XSLT_LIBS)
+
+bin_PROGRAMS =
+noinst_PROGRAMS = p2 
 
-yazproxy_SOURCES=yaz-proxy-main.cpp
-cdetails_SOURCES=cdetails.cpp
-tstthreads_SOURCES=tstthreads.cpp
-t_server_SOURCES=t-server.cpp
 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
 
-LDADD=libyazproxy.la $(YAZPPLALIB) $(XSLT_LIBS) $(USEMARCONLALIB)
-libyazproxy_la_LIBADD = $(XSLT_LIBS)
+# 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
+
+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
+
+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)
 
-# 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)