X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2FMakefile.am;h=0f2d0c71d7536d61fbb90b184f7b9ca7b4df3236;hb=8a0eb6c2d9512ea9ca7fdabea740cac5dd769490;hp=2843b2b3045b6984aad215cd09b0c3212f3b0f62;hpb=f33d2c2293d082f63288d8dd430924174837902b;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 2843b2b..0f2d0c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,26 @@
-## $Id: Makefile.am,v 1.6 2005-10-07 09:21:41 marc Exp $
+## $Id: Makefile.am,v 1.15 2005-10-12 23:30:43 adam Exp $
+
+MAINTAINERCLEANFILES    = Makefile.in config.in config.hpp
+
 
 AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
 
+YP2_INCHPP = session.hpp package.hpp filter.hpp router.hpp
+
 bin_PROGRAMS =
-check_PROGRAMS = test_filter1 test_filter2 test_session1 \
-                test_thread_pool_observer test_boost_threads
-noinst_PROGRAMS =  p2 design
+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)
 
-design_SOURCES=design.h  design_main.cpp
-
-test_filter1_SOURCES=test_filter1.cpp
-test_filter2_SOURCES=test_filter2.cpp
-test_session1_SOURCES=test_session1.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
 
@@ -26,7 +32,19 @@ p2_SOURCES=p2_frontend.cpp p2_msg.cpp p2.cpp p2_frontend.h \
  thread_pool_observer.cpp thread_pool_observer.h
 
 
-LDADD= $(YAZPPLALIB) $(XSLT_LIBS) -lboost_thread
+LDADD= $(YAZPPLALIB) $(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
 
+# doxygen target
+dox:
+	(cd $(top_srcdir) ; make dox) 
 
-# Modules
+showdox:
+	(cd $(top_srcdir) ; make showdox)