From ffc8fc2e03a64fe20b84e0cd5e1fe722d84271ee Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 13 Jun 2013 11:57:17 +0200 Subject: [PATCH] Build-in filters part of libmetaproxy so again And registration takes place in FactoryStatic . Not really elegant. --- src/Makefile.am | 34 +++++++++++++++++----------------- src/factory_static.cpp | 4 ---- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ea0cd46..564f7b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,6 +42,7 @@ lib_LTLIBRARIES = libmetaproxy.la libmetaproxy_la_LDFLAGS = -version-info 4:0:0 -export-dynamic libmetaproxy_la_SOURCES = \ + $(filter_src) \ factory_filter.cpp factory_filter.hpp \ factory_static.cpp factory_static.hpp \ filter.cpp \ @@ -78,7 +79,7 @@ bin_PROGRAMS = metaproxy noinst_PROGRAMS = tstdl tstdl_SOURCES = tstdl.cpp -metaproxy_SOURCES = metaproxy_prog.cpp $(filter_src) +metaproxy_SOURCES = metaproxy_prog.cpp # Rules for dl programs pkglib_LTLIBRARIES = metaproxy_filter_dl.la @@ -116,27 +117,26 @@ TESTS=$(check_PROGRAMS) test_package1_SOURCES=test_package1.cpp test_pipe_SOURCES=test_pipe.cpp -test_filter1_SOURCES=test_filter1.cpp $(filter_src) -test_filter2_SOURCES=test_filter2.cpp $(filter_src) +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_thread_pool_observer_SOURCES = test_thread_pool_observer.cpp -test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp $(filter_src) -test_filter_factory_SOURCES = test_filter_factory.cpp $(filter_src) -test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp $(filter_src) -test_filter_log_SOURCES = test_filter_log.cpp $(filter_src) -test_filter_multi_SOURCES = test_filter_multi.cpp $(filter_src) -test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp $(filter_src) -test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp $(filter_src) -test_filter_backend_test_SOURCES = test_filter_backend_test.cpp $(filter_src) -test_filter_bounce_SOURCES = test_filter_bounce.cpp $(filter_src) -test_filter_record_transform_SOURCES = test_filter_record_transform.cpp \ - $(filter_src) -test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp $(filter_src) -test_filter_virt_db_SOURCES = test_filter_virt_db.cpp $(filter_src) +test_filter_auth_simple_SOURCES = test_filter_auth_simple.cpp +test_filter_factory_SOURCES = test_filter_factory.cpp +test_filter_frontend_net_SOURCES = test_filter_frontend_net.cpp +test_filter_log_SOURCES = test_filter_log.cpp +test_filter_multi_SOURCES = test_filter_multi.cpp +test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp +test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp +test_filter_backend_test_SOURCES = test_filter_backend_test.cpp +test_filter_bounce_SOURCES = test_filter_bounce.cpp +test_filter_record_transform_SOURCES = test_filter_record_transform.cpp +test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp +test_filter_virt_db_SOURCES = test_filter_virt_db.cpp test_ses_map_SOURCES = test_ses_map.cpp -test_router_flexml_SOURCES = test_router_flexml.cpp $(filter_src) +test_router_flexml_SOURCES = test_router_flexml.cpp test_xmlutil_SOURCES = test_xmlutil.cpp # doxygen target diff --git a/src/factory_static.cpp b/src/factory_static.cpp index e0118d4..3d88a82 100644 --- a/src/factory_static.cpp +++ b/src/factory_static.cpp @@ -59,8 +59,6 @@ namespace mp = metaproxy_1; mp::FactoryStatic::FactoryStatic() { -#ifdef HAVE_DLFCN_H -#else struct metaproxy_1_filter_struct *buildins[] = { &metaproxy_1_filter_auth_simple, &metaproxy_1_filter_backend_test, @@ -95,8 +93,6 @@ mp::FactoryStatic::FactoryStatic() for (i = 0; buildins[i]; i++) add_creator(buildins[i]->type, buildins[i]->creator); -// WIN32 -#endif } -- 1.7.10.4