Mercurial > dovecot > core-2.2

changeset 20371:eae726541234

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-http: Restructured Makefile.am to have less duplicated lines for the test suite.
author Stephan Bosch <stephan@dovecot.fi>
date Mon, 20 Jun 2016 02:41:37 +0200
parents 142b1aac8bea
children 0dcb9bb9862a
files src/lib-http/Makefile.am
diffstat 1 files changed, 20 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-http/Makefile.am	Mon Jun 20 01:25:02 2016 +0200
+++ b/src/lib-http/Makefile.am	Mon Jun 20 02:41:37 2016 +0200
@@ -132,33 +132,14 @@
 	$(test_libs)
 test_http_request_parser_DEPENDENCIES = $(test_deps)
 
-test_http_payload_SOURCES = test-http-payload.c
-test_http_payload_LDFLAGS = -export-dynamic
-test_http_payload_LDADD = \
+test_http_libs = \
 	libhttp.la \
 	../lib-dns/libdns.la \
 	../lib-ssl-iostream/libssl_iostream.la \
 	../lib-master/libmaster.la \
 	../lib-settings/libsettings.la \
 	$(test_libs)
-test_http_payload_DEPENDENCIES = \
-	libhttp.la \
-	../lib-dns/libdns.la \
-	../lib-ssl-iostream/libssl_iostream.la \
-	../lib-master/libmaster.la \
-	../lib-settings/libsettings.la \
-	$(test_deps)
-
-test_http_client_SOURCES = test-http-client.c
-test_http_client_LDFLAGS = -export-dynamic
-test_http_client_LDADD = \
-	libhttp.la \
-	../lib-dns/libdns.la \
-	../lib-ssl-iostream/libssl_iostream.la \
-	../lib-master/libmaster.la \
-	../lib-settings/libsettings.la \
-	$(test_libs)
-test_http_client_DEPENDENCIES = \
+test_http_deps = \
 	libhttp.la \
 	../lib-dns/libdns.la \
 	../lib-ssl-iostream/libssl_iostream.la \
@@ -166,39 +147,33 @@
 	../lib-settings/libsettings.la \
 	$(test_deps)
 
+test_http_payload_SOURCES = test-http-payload.c
+test_http_payload_LDFLAGS = -export-dynamic
+test_http_payload_LDADD = \
+	$(test_http_libs)
+test_http_payload_DEPENDENCIES = \
+	$(test_http_deps)
+
+test_http_client_SOURCES = test-http-client.c
+test_http_client_LDFLAGS = -export-dynamic
+test_http_client_LDADD = \
+	$(test_http_libs)
+test_http_client_DEPENDENCIES = \
+	$(test_http_deps)
+
 test_http_client_errors_SOURCES = test-http-client-errors.c
 test_http_client_errors_LDFLAGS = -export-dynamic
 test_http_client_errors_LDADD = \
-	libhttp.la \
-	../lib-dns/libdns.la \
-	../lib-ssl-iostream/libssl_iostream.la \
-	../lib-master/libmaster.la \
-	../lib-settings/libsettings.la \
-	$(test_libs)
+	$(test_http_libs)
 test_http_client_errors_DEPENDENCIES = \
-	libhttp.la \
-	../lib-dns/libdns.la \
-	../lib-ssl-iostream/libssl_iostream.la \
-	../lib-master/libmaster.la \
-	../lib-settings/libsettings.la \
-	$(test_deps)
+	$(test_http_deps)
 
 test_http_server_SOURCES = test-http-server.c
 test_http_server_LDFLAGS = -export-dynamic
 test_http_server_LDADD = \
-	libhttp.la \
-	../lib-dns/libdns.la \
-	../lib-ssl-iostream/libssl_iostream.la \
-	../lib-master/libmaster.la \
-	../lib-settings/libsettings.la \
-	$(test_libs)
+	$(test_http_libs)
 test_http_server_DEPENDENCIES = \
-	libhttp.la \
-	../lib-dns/libdns.la \
-	../lib-ssl-iostream/libssl_iostream.la \
-	../lib-master/libmaster.la \
-	../lib-settings/libsettings.la \
-	$(test_deps)
+	$(test_http_deps)
 
 check: check-am check-test
 check-test: all-am