X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=9f7bb091f3ba99cc6ee5a601e7c7feb1177c7329;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=ea0cd4687e2da109ea97cd79f3cdc5e8b692e952;hpb=fc12f2596c5150ee78d41d379430476208ea0548;p=metaproxy-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index ea0cd46..9f7bb09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 ## This file is part of Metaproxy
-## Copyright (C) 2005-2013 Index Data
+## Copyright (C) Index Data
+## See the file LICENSE for details.
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
@@ -16,11 +17,12 @@ filter_src = \
 	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 \
@@ -39,9 +41,10 @@ filter_src = \
 	filter_zoom.cpp filter_zoom.hpp
 
 lib_LTLIBRARIES = libmetaproxy.la
-libmetaproxy_la_LDFLAGS = -version-info 4:0:0 -export-dynamic
+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 \
@@ -56,6 +59,7 @@ libmetaproxy_la_SOURCES = \
 	torus.cpp torus.hpp \
 	url_recipe.cpp \
 	util.cpp \
+	html_parser.hpp html_parser.cpp \
 	router_chain.cpp \
         router_flexml.hpp router_flexml.cpp \
 	router_xml.cpp \
@@ -78,7 +82,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
@@ -108,40 +112,44 @@ 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)
 
 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
 
+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)