X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2FMakefile.am;h=042d9d61896e7420942524725c884b38ddf479d0;hb=855346b9d749d6ff937e838e8afb299daa7e4cb2;hp=16b46d32f3c781f45f4cf98adac0175d3cf074ad;hpb=7993f86c75d0d5ab736b0fd2d1b1bebff35bc95b;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 16b46d3..042d9d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,28 @@
-## $Id: Makefile.am,v 1.4 2005-10-06 19:33:58 adam Exp $
+## $Id: Makefile.am,v 1.13 2005-10-08 17:28:28 marc Exp $
 
-AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS) $(USEMARCONINC)
+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_thread_pool_observer
-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_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 \
@@ -20,10 +31,19 @@ p2_SOURCES=p2_frontend.cpp p2_msg.cpp p2.cpp p2_frontend.h \
  p2_xmlerror.cpp p2_xmlerror.h \
  thread_pool_observer.cpp thread_pool_observer.h
 
-test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp \
- thread_pool_observer.cpp thread_pool_observer.h
 
-LDADD= $(YAZPPLALIB) $(XSLT_LIBS) $(USEMARCONLALIB)
+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
+
+
 
 
-# Modules
+# doxygen target
+dox:
+	(cd $(top_srcdir) ; make dox)