dovecot-2.2: Makefile: Fixed test program dependencies

dovecot at dovecot.org dovecot at dovecot.org
Sun Sep 16 15:40:34 EEST 2012 

details:   http://hg.dovecot.org/dovecot-2.2/rev/00df9f4192ad
changeset: 15074:00df9f4192ad
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Sep 16 15:40:10 2012 +0300
description:
Makefile: Fixed test program dependencies
Explicit dependencies on .o or .lo files didn't seem to work properly and
with high enough make -j value the build failed. Depending on the entire
library guarantees that all the individual .o files have been built.

diffstat:

 src/anvil/Makefile.am             |   2 +-
 src/auth/Makefile.am              |   2 +-
 src/director/Makefile.am          |   2 +-
 src/doveadm/dsync/Makefile.am     |   4 +-
 src/lib-dict/Makefile.am          |   4 +-
 src/lib-imap/Makefile.am          |  26 +++++++------
 src/lib-index/Makefile.am         |  24 ++++++-----
 src/lib-mail/Makefile.am          |  76 ++++++++++++++++++++------------------
 src/lib-storage/Makefile.am       |   4 +-
 src/plugins/fts-squat/Makefile.am |   4 +-
 src/plugins/fts/Makefile.am       |   4 +-
 11 files changed, 79 insertions(+), 73 deletions(-)

diffs (truncated from 318 to 300 lines):

diff -r 8b0d967e61cf -r 00df9f4192ad src/anvil/Makefile.am
--- a/src/anvil/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/anvil/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -38,7 +38,7 @@
 
 test_penalty_SOURCES = test-penalty.c
 test_penalty_LDADD = penalty.o $(test_libs)
-test_penalty_DEPENDENCIES = penalty.o $(test_libs)
+test_penalty_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/auth/Makefile.am
--- a/src/auth/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/auth/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -203,7 +203,7 @@
 
 test_auth_cache_SOURCES = test-auth-cache.c
 test_auth_cache_LDADD = auth-cache.o $(test_libs)
-test_auth_cache_DEPENDENCIES = auth-cache.o $(test_libs)
+test_auth_cache_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/director/Makefile.am
--- a/src/director/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/director/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -58,7 +58,7 @@
 
 test_user_directory_SOURCES = test-user-directory.c
 test_user_directory_LDADD = user-directory.o $(test_libs)
-test_user_directory_DEPENDENCIES = user-directory.o $(test_libs)
+test_user_directory_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/doveadm/dsync/Makefile.am
--- a/src/doveadm/dsync/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/doveadm/dsync/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -60,8 +60,8 @@
 	../../lib/liblib.la
 
 test_dsync_mailbox_tree_sync_SOURCES = test-dsync-mailbox-tree-sync.c
-test_dsync_mailbox_tree_sync_LDADD = dsync-mailbox-tree-sync.lo dsync-mailbox-tree.lo $(test_libs)
-test_dsync_mailbox_tree_sync_DEPENDENCIES = dsync-mailbox-tree-sync.lo dsync-mailbox-tree.lo $(test_libs)
+test_dsync_mailbox_tree_sync_LDADD = dsync-mailbox-tree-sync.o dsync-mailbox-tree.o $(test_libs)
+test_dsync_mailbox_tree_sync_DEPENDENCIES = $(noinst_LIBRARIES) $(test_libs)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/lib-dict/Makefile.am
--- a/src/lib-dict/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/lib-dict/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -84,8 +84,8 @@
 	../lib/liblib.la
 
 test_dict_SOURCES = test-dict.c
-test_dict_LDADD = dict.lo $(test_libs)
-test_dict_DEPENDENCIES = dict.lo $(test_libs)
+test_dict_LDADD = dict.o $(test_libs)
+test_dict_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/lib-imap/Makefile.am
--- a/src/lib-imap/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/lib-imap/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -54,29 +54,31 @@
 	../lib-test/libtest.la \
 	../lib/liblib.la
 
+test_deps = $(noinst_LTLIBRARIES) $(test_libs)
+
 test_imap_bodystructure_SOURCES = test-imap-bodystructure.c
-test_imap_bodystructure_LDADD = imap-bodystructure.lo imap-envelope.lo imap-quote.lo imap-parser.lo imap-arg.lo ../lib-mail/libmail.la $(test_libs)
-test_imap_bodystructure_DEPENDENCIES = imap-bodystructure.lo imap-envelope.lo imap-quote.lo imap-parser.lo imap-arg.lo ../lib-mail/libmail.la $(test_libs)
+test_imap_bodystructure_LDADD = imap-bodystructure.o imap-envelope.o imap-quote.o imap-parser.o imap-arg.o ../lib-mail/libmail.la $(test_libs)
+test_imap_bodystructure_DEPENDENCIES = $(test_deps) ../lib-mail/libmail.la
 
 test_imap_match_SOURCES = test-imap-match.c
-test_imap_match_LDADD = imap-match.lo $(test_libs)
-test_imap_match_DEPENDENCIES = imap-match.lo $(test_libs)
+test_imap_match_LDADD = imap-match.o $(test_libs)
+test_imap_match_DEPENDENCIES = $(test_deps)
 
 test_imap_parser_SOURCES = test-imap-parser.c
-test_imap_parser_LDADD = imap-parser.lo imap-arg.lo $(test_libs)
-test_imap_parser_DEPENDENCIES = imap-parser.lo imap-arg.lo $(test_libs)
+test_imap_parser_LDADD = imap-parser.o imap-arg.o $(test_libs)
+test_imap_parser_DEPENDENCIES = $(test_deps)
 
 test_imap_url_SOURCES = test-imap-url.c
-test_imap_url_LDADD = imap-url.lo  $(test_libs)
-test_imap_url_DEPENDENCIES = imap-url.lo $(test_libs)
+test_imap_url_LDADD = imap-url.o  $(test_libs)
+test_imap_url_DEPENDENCIES = $(test_deps)
 
 test_imap_utf7_SOURCES = test-imap-utf7.c
-test_imap_utf7_LDADD = imap-utf7.lo $(test_libs)
-test_imap_utf7_DEPENDENCIES = imap-utf7.lo $(test_libs)
+test_imap_utf7_LDADD = imap-utf7.o $(test_libs)
+test_imap_utf7_DEPENDENCIES = $(test_deps)
 
 test_imap_util_SOURCES = test-imap-util.c
-test_imap_util_LDADD = imap-util.lo imap-arg.lo $(test_libs)
-test_imap_util_DEPENDENCIES = imap-util.lo imap-arg.lo $(test_libs)
+test_imap_util_LDADD = imap-util.o imap-arg.o $(test_libs)
+test_imap_util_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/lib-index/Makefile.am
--- a/src/lib-index/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/lib-index/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -70,29 +70,31 @@
 noinst_PROGRAMS = $(test_programs)
 
 test_libs = \
-	mail-index-util.lo \
+	mail-index-util.o \
 	../lib-test/libtest.la \
 	../lib/liblib.la
 
+test_deps = $(noinst_LTLIBRARIES) $(test_libs)
+
 test_mail_index_sync_ext_SOURCES = test-mail-index-sync-ext.c
-test_mail_index_sync_ext_LDADD = mail-index-sync-ext.lo $(test_libs)
-test_mail_index_sync_ext_DEPENDENCIES = mail-index-sync-ext.lo $(test_libs)
+test_mail_index_sync_ext_LDADD = mail-index-sync-ext.o $(test_libs)
+test_mail_index_sync_ext_DEPENDENCIES = $(test_deps)
 
 test_mail_index_transaction_finish_SOURCES = test-mail-index-transaction-finish.c
-test_mail_index_transaction_finish_LDADD = mail-index-transaction-finish.lo $(test_libs)
-test_mail_index_transaction_finish_DEPENDENCIES = mail-index-transaction-finish.lo $(test_libs)
+test_mail_index_transaction_finish_LDADD = mail-index-transaction-finish.o $(test_libs)
+test_mail_index_transaction_finish_DEPENDENCIES = $(test_deps)
 
 test_mail_index_transaction_update_SOURCES = test-mail-index-transaction-update.c
-test_mail_index_transaction_update_LDADD = mail-index-transaction-update.lo $(test_libs)
-test_mail_index_transaction_update_DEPENDENCIES = mail-index-transaction-update.lo $(test_libs)
+test_mail_index_transaction_update_LDADD = mail-index-transaction-update.o $(test_libs)
+test_mail_index_transaction_update_DEPENDENCIES = $(test_deps)
 
 test_mail_transaction_log_append_SOURCES = test-mail-transaction-log-append.c
-test_mail_transaction_log_append_LDADD = mail-transaction-log-append.lo $(test_libs)
-test_mail_transaction_log_append_DEPENDENCIES = mail-transaction-log-append.lo $(test_libs)
+test_mail_transaction_log_append_LDADD = mail-transaction-log-append.o $(test_libs)
+test_mail_transaction_log_append_DEPENDENCIES = $(test_deps)
 
 test_mail_transaction_log_view_SOURCES = test-mail-transaction-log-view.c
-test_mail_transaction_log_view_LDADD = mail-transaction-log-view.lo $(test_libs)
-test_mail_transaction_log_view_DEPENDENCIES = mail-transaction-log-view.lo $(test_libs)
+test_mail_transaction_log_view_LDADD = mail-transaction-log-view.o $(test_libs)
+test_mail_transaction_log_view_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/lib-mail/Makefile.am
--- a/src/lib-mail/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/lib-mail/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -87,76 +87,78 @@
 	../lib-test/libtest.la \
 	../lib/liblib.la
 
+test_deps = $(noinst_LTLIBRARIES) $(test_libs)
+
 test_istream_dot_SOURCES = test-istream-dot.c
-test_istream_dot_LDADD = istream-dot.lo $(test_libs)
-test_istream_dot_DEPENDENCIES = istream-dot.lo $(test_libs)
+test_istream_dot_LDADD = istream-dot.o $(test_libs)
+test_istream_dot_DEPENDENCIES = $(test_deps)
 
 test_istream_qp_decoder_SOURCES = test-istream-qp-decoder.c
-test_istream_qp_decoder_LDADD = istream-qp-decoder.lo quoted-printable.lo $(test_libs)
-test_istream_qp_decoder_DEPENDENCIES = istream-qp-decoder.lo quoted-printable.lo $(test_libs)
+test_istream_qp_decoder_LDADD = istream-qp-decoder.o quoted-printable.o $(test_libs)
+test_istream_qp_decoder_DEPENDENCIES = $(test_deps)
 
 message_parser_objects = \
-	message-parser.lo \
-	message-header-parser.lo \
-	message-size.lo \
-	rfc822-parser.lo \
-	rfc2231-parser.lo
+	message-parser.o \
+	message-header-parser.o \
+	message-size.o \
+	rfc822-parser.o \
+	rfc2231-parser.o
 
 test_istream_binary_converter_SOURCES = test-istream-binary-converter.c
-test_istream_binary_converter_LDADD = istream-binary-converter.lo $(message_parser_objects)  $(test_libs)
-test_istream_binary_converter_DEPENDENCIES = istream-binary-converter.lo $(message_parser_objects)  $(test_libs)
+test_istream_binary_converter_LDADD = istream-binary-converter.o $(message_parser_objects)  $(test_libs)
+test_istream_binary_converter_DEPENDENCIES = $(test_deps)
 
 test_istream_attachment_SOURCES = test-istream-attachment.c
-test_istream_attachment_LDADD = istream-attachment-extractor.lo istream-attachment-connector.lo $(message_parser_objects) $(test_libs)
-test_istream_attachment_DEPENDENCIES = istream-attachment-extractor.lo istream-attachment-connector.lo $(message_parser_objects)  $(test_libs)
+test_istream_attachment_LDADD = istream-attachment-extractor.o istream-attachment-connector.o $(message_parser_objects) $(test_libs)
+test_istream_attachment_DEPENDENCIES = $(test_deps)
 
 test_istream_header_filter_SOURCES = test-istream-header-filter.c
-test_istream_header_filter_LDADD = istream-header-filter.lo message-header-parser.lo $(test_libs)
-test_istream_header_filter_DEPENDENCIES = istream-header-filter.lo message-header-parser.lo $(test_libs)
+test_istream_header_filter_LDADD = istream-header-filter.o message-header-parser.o $(test_libs)
+test_istream_header_filter_DEPENDENCIES = $(test_deps)
 
 test_mbox_from_SOURCES = test-mbox-from.c
-test_mbox_from_LDADD = mbox-from.lo $(test_libs)
-test_mbox_from_DEPENDENCIES = mbox-from.lo $(test_libs)
+test_mbox_from_LDADD = mbox-from.o $(test_libs)
+test_mbox_from_DEPENDENCIES = $(test_deps)
 
 test_message_address_SOURCES = test-message-address.c
-test_message_address_LDADD = message-address.lo rfc822-parser.lo $(test_libs)
-test_message_address_DEPENDENCIES = message-address.lo rfc822-parser.lo $(test_libs)
+test_message_address_LDADD = message-address.o rfc822-parser.o $(test_libs)
+test_message_address_DEPENDENCIES = $(test_deps)
 
 test_message_date_SOURCES = test-message-date.c
-test_message_date_LDADD = message-date.lo rfc822-parser.lo $(test_libs)
-test_message_date_DEPENDENCIES = message-date.lo rfc822-parser.lo $(test_libs)
+test_message_date_LDADD = message-date.o rfc822-parser.o $(test_libs)
+test_message_date_DEPENDENCIES = $(test_deps)
 
 test_message_decoder_SOURCES = test-message-decoder.c
-test_message_decoder_LDADD = message-decoder.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
-test_message_decoder_DEPENDENCIES = message-decoder.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
+test_message_decoder_LDADD = message-decoder.o rfc822-parser.o rfc2231-parser.o $(test_libs)
+test_message_decoder_DEPENDENCIES = $(test_deps)
 
 test_message_header_decode_SOURCES = test-message-header-decode.c
-test_message_header_decode_LDADD = message-header-decode.lo quoted-printable.lo $(test_libs)
-test_message_header_decode_DEPENDENCIES = message-header-decode.lo quoted-printable.lo $(test_libs)
+test_message_header_decode_LDADD = message-header-decode.o quoted-printable.o $(test_libs)
+test_message_header_decode_DEPENDENCIES = $(test_deps)
 
 test_message_header_encode_SOURCES = test-message-header-encode.c
-test_message_header_encode_LDADD = message-header-encode.lo $(test_libs)
-test_message_header_encode_DEPENDENCIES = message-header-encode.lo $(test_libs)
+test_message_header_encode_LDADD = message-header-encode.o $(test_libs)
+test_message_header_encode_DEPENDENCIES = $(test_deps)
 
 test_message_header_parser_SOURCES = test-message-header-parser.c
-test_message_header_parser_LDADD = message-header-parser.lo $(test_libs)
-test_message_header_parser_DEPENDENCIES = message-header-parser.lo $(test_libs)
+test_message_header_parser_LDADD = message-header-parser.o $(test_libs)
+test_message_header_parser_DEPENDENCIES = $(test_deps)
 
 test_message_id_SOURCES = test-message-id.c
-test_message_id_LDADD = message-id.lo rfc822-parser.lo $(test_libs)
-test_message_id_DEPENDENCIES = message-id.lo rfc822-parser.lo $(test_libs)
+test_message_id_LDADD = message-id.o rfc822-parser.o $(test_libs)
+test_message_id_DEPENDENCIES = $(test_deps)
 
 test_message_parser_SOURCES = test-message-parser.c
-test_message_parser_LDADD = message-parser.lo message-header-parser.lo message-size.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
-test_message_parser_DEPENDENCIES = message-parser.lo message-header-parser.lo message-size.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
+test_message_parser_LDADD = message-parser.o message-header-parser.o message-size.o rfc822-parser.o rfc2231-parser.o $(test_libs)
+test_message_parser_DEPENDENCIES = $(test_deps)
 
 test_quoted_printable_SOURCES = test-quoted-printable.c
-test_quoted_printable_LDADD = quoted-printable.lo $(test_libs)
-test_quoted_printable_DEPENDENCIES = quoted-printable.lo $(test_libs)
+test_quoted_printable_LDADD = quoted-printable.o $(test_libs)
+test_quoted_printable_DEPENDENCIES = $(test_deps)
 
 test_rfc2231_parser_SOURCES = test-rfc2231-parser.c
-test_rfc2231_parser_LDADD = rfc2231-parser.lo rfc822-parser.lo $(test_libs)
-test_rfc2231_parser_DEPENDENCIES = rfc2231-parser.lo rfc822-parser.lo $(test_libs)
+test_rfc2231_parser_LDADD = rfc2231-parser.o rfc822-parser.o $(test_libs)
+test_rfc2231_parser_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/lib-storage/Makefile.am
--- a/src/lib-storage/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/lib-storage/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -102,8 +102,8 @@
 	$(top_builddir)/src/lib/liblib.la
 
 test_mailbox_get_SOURCES = test-mailbox-get.c
-test_mailbox_get_LDADD = mailbox-get.lo $(test_libs)
-test_mailbox_get_DEPENDENCIES = mailbox-get.lo $(test_libs)
+test_mailbox_get_LDADD = mailbox-get.o $(test_libs)
+test_mailbox_get_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
 
 check: check-am check-test
 check-test: all-am
diff -r 8b0d967e61cf -r 00df9f4192ad src/plugins/fts-squat/Makefile.am
--- a/src/plugins/fts-squat/Makefile.am	Sun Sep 16 04:16:07 2012 +0300
+++ b/src/plugins/fts-squat/Makefile.am	Sun Sep 16 15:40:10 2012 +0300
@@ -34,8 +34,8 @@
 	squat-test.c
 
 common_objects = \
-	squat-trie.lo \
-	squat-uidlist.lo
+	squat-trie.o \

More information about the dovecot-cvs mailing list