Fix Metaproxy stops logging after check config failed MP-590

[metaproxy-moved-to-github.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7972352..9f7bb09 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 ## This file is part of Metaproxy
-## Copyright (C) 2005-2011 Index Data
+## Copyright (C) Index Data
+## See the file LICENSE for details.
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
@@ -7,68 +8,79 @@ DISTCLEANFILES = metaproxy-config
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-AM_LDFLAGS =
+AM_CPPFLAGS = -I$(top_srcdir)/include $(USEMARCONINC)
 
 bin_SCRIPTS = metaproxy-config
 
-# Rules for the library..
-
-lib_LTLIBRARIES = libmetaproxy.la
-libmetaproxy_la_LDFLAGS = -version-info 3:0:0 -export-dynamic
-
-libmetaproxy_la_SOURCES = \
-       factory_filter.cpp factory_filter.hpp \
-       factory_static.cpp factory_static.hpp \
-       filter.cpp \
+filter_src = \
        filter_auth_simple.cpp filter_auth_simple.hpp \
        filter_backend_test.cpp filter_backend_test.hpp \
        filter_bounce.cpp filter_bounce.hpp \
        filter_cgi.cpp filter_cgi.hpp \
-       filter_cql_to_rpn.cpp filter_cql_to_rpn.hpp \
+       filter_cql_rpn.cpp filter_cql_rpn.hpp \
        filter_frontend_net.cpp filter_frontend_net.hpp \
+       filter_http_client.cpp filter_http_client.hpp \
        filter_http_file.cpp filter_http_file.hpp \
+       filter_http_rewrite1.cpp filter_http_rewrite1.hpp \
+       filter_http_rewrite.cpp filter_http_rewrite.hpp \
        filter_limit.cpp filter_limit.hpp \
        filter_load_balance.cpp filter_load_balance.hpp \
        filter_log.cpp filter_log.hpp \
        filter_multi.cpp filter_multi.hpp \
        filter_query_rewrite.cpp filter_query_rewrite.hpp \
+       filter_present_chunk.cpp filter_present_chunk.hpp \
        filter_record_transform.cpp filter_record_transform.hpp \
        filter_session_shared.cpp filter_session_shared.hpp \
+       filter_sd_remove.cpp filter_sd_remove.hpp \
+       filter_sort.cpp filter_sort.hpp \
         filter_sru_to_z3950.cpp  filter_sru_to_z3950.hpp \
        filter_template.cpp filter_template.hpp \
        filter_virt_db.cpp filter_virt_db.hpp \
        filter_z3950_client.cpp filter_z3950_client.hpp \
        filter_zeerex_explain.cpp  filter_zeerex_explain.hpp \
-       filter_zoom.cpp filter_zoom.hpp \
+       filter_zoom.cpp filter_zoom.hpp
+
+lib_LTLIBRARIES = libmetaproxy.la
+libmetaproxy_la_LDFLAGS = -version-info 6:0:0 -export-dynamic
+
+libmetaproxy_la_SOURCES = \
+       $(filter_src) \
+       factory_filter.cpp factory_filter.hpp \
+       factory_static.cpp factory_static.hpp \
+       filter.cpp \
        gduutil.cpp gduutil.hpp \
        origin.cpp \
        package.cpp \
        pipe.cpp pipe.hpp \
        plainfile.cpp \
-       router_chain.hpp router_chain.cpp \
-        router_flexml.hpp router_flexml.cpp \
        session.cpp \
        sru_util.cpp sru_util.hpp \
        thread_pool_observer.cpp thread_pool_observer.hpp \
        torus.cpp torus.hpp \
        url_recipe.cpp \
        util.cpp \
-       xmlutil.cpp 
+       html_parser.hpp html_parser.cpp \
+       router_chain.cpp \
+        router_flexml.hpp router_flexml.cpp \
+       router_xml.cpp \
+       xmlutil.cpp
 
+libmetaproxy_la_LIBADD = $(YAZPPLALIB) \
+       $(BOOST_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) \
+       $(BOOST_REGEX_LIB)
 
-libmetaproxy_la_LIBADD = $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) $(BOOST_REGEX_LIB)
+metaproxy_LDADD = libmetaproxy.la $(YAZPPLALIB) \
+       $(BOOST_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) \
+       $(BOOST_REGEX_LIB) $(USEMARCONLALIB)
 
-# Rules for lib
+tstdl_LDADD = $(metaproxy_LDADD)
 
-LDADD = libmetaproxy.la $(YAZPPLALIB) $(BOOST_LIB) $(BOOST_THREAD_LIB) $(BOOST_REGEX_LIB)
+LDADD = $(metaproxy_LDADD) $(BOOST_TEST_LIB)
+AM_LDFLAGS = -export-dynamic
 
 bin_PROGRAMS = metaproxy
-noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml tstdl
+noinst_PROGRAMS = tstdl
 
-ex_filter_frontend_net_SOURCES = ex_filter_frontend_net.cpp
-ex_router_flexml_SOURCES =  ex_router_flexml.cpp
 tstdl_SOURCES = tstdl.cpp
 metaproxy_SOURCES = metaproxy_prog.cpp
 
@@ -100,8 +112,10 @@ check_PROGRAMS = \
        test_filter_record_transform \
        test_filter_sru_to_z3950 \
        test_filter_virt_db \
+       test_filter_rewrite \
        test_ses_map \
        test_router_flexml \
+       test_html_parser \
        test_xmlutil
 
 TESTS=$(check_PROGRAMS)
@@ -130,35 +144,12 @@ test_ses_map_SOURCES = test_ses_map.cpp
 test_router_flexml_SOURCES = test_router_flexml.cpp
 test_xmlutil_SOURCES = test_xmlutil.cpp
 
-TESTLDADD = $(LDADD) $(BOOST_TEST_LIB)
-
-test_package1_LDADD = $(TESTLDADD)
-test_pipe_LDADD = $(TESTLDADD)
-test_filter1_LDADD = $(TESTLDADD)
-test_filter2_LDADD = $(TESTLDADD)
-test_session1_LDADD = $(TESTLDADD)
-test_session2_LDADD = $(TESTLDADD)
-test_boost_threads_LDADD = $(TESTLDADD)
-test_filter_auth_simple_LDADD = $(TESTLDADD)
-test_filter_factory_LDADD = $(TESTLDADD)
-test_filter_frontend_net_LDADD = $(TESTLDADD)
-test_filter_log_LDADD = $(TESTLDADD)
-test_filter_multi_LDADD = $(TESTLDADD)
-test_filter_query_rewrite_LDADD = $(TESTLDADD)
-test_filter_z3950_client_LDADD = $(TESTLDADD)
-test_filter_backend_test_LDADD = $(TESTLDADD)
-test_filter_bounce_LDADD = $(TESTLDADD)
-test_filter_record_transform_LDADD = $(TESTLDADD)
-test_filter_sru_to_z3950_LDADD = $(TESTLDADD)
-test_filter_virt_db_LDADD = $(TESTLDADD)
-test_router_flexml_LDADD = $(TESTLDADD)
-test_ses_map_LDADD = $(TESTLDADD)
-test_thread_pool_observer_LDADD = $(TESTLDADD)
-test_xmlutil_LDADD = $(TESTLDADD)
+test_html_parser_SOURCES = test_html_parser.cpp
+test_filter_rewrite_SOURCES = test_filter_rewrite.cpp
 
 # doxygen target
 dox:
-       (cd $(top_srcdir) ; make dox) 
+       (cd $(top_srcdir) ; make dox)
 
 showdox:
-       (cd $(top_srcdir) ; make showdox) 
+       (cd $(top_srcdir) ; make showdox)