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

diff --git a/src/Makefile.am b/src/Makefile.am
index 269edad..1587d49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,33 +1,68 @@
-## $Id: Makefile.am,v 1.9 2005-10-07 13:56:02 adam Exp $
+## $Id: Makefile.am,v 1.17 2005-10-13 20:06:45 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_thread_pool_observer test_boost_threads
-noinst_PROGRAMS =  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
 
-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_boost_threads_SOURCES=test_boost_threads.cpp
-test_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp \
-          thread_pool_observer.cpp thread_pool_observer.h
+# Rules for programs..
+
+LDADD= libyp2.la $(YAZPPLALIB) $(XSLT_LIBS)
+
+bin_PROGRAMS =
+noinst_PROGRAMS = p2 
 
 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
+ p2_xmlerror.cpp p2_xmlerror.h
+
+# 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
 
-LDADD= $(YAZPPLALIB) $(XSLT_LIBS)
+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_filter1_LDADD = $(LDADD) -lboost_unit_test_framework
-test_boost_threads_LDADD = $(LDADD) -lboost_unit_test_framework
+# doxygen target
+dox:
+	(cd $(top_srcdir) ; make dox) 
 
+showdox:
+	(cd $(top_srcdir) ; make showdox)