dovecot-2.2: Makefile: Again changes to handling test program de...

dovecot at dovecot.org dovecot at dovecot.org
Sun Sep 16 16:42:39 EEST 2012 

details:   http://hg.dovecot.org/dovecot-2.2/rev/a2159b6d1518
changeset: 15082:a2159b6d1518
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Sep 16 16:42:25 2012 +0300
description:
Makefile: Again changes to handling test program dependencies.
.la libraries need to link .lo files, .a libraries need to link .o files.
Changed dsync to be .la library for consistency.

diffstat:

 src/doveadm/Makefile.am       |   2 +-
 src/doveadm/dsync/Makefile.am |   8 ++++----
 src/lib-dict/Makefile.am      |   2 +-
 src/lib-imap/Makefile.am      |  12 ++++++------
 src/lib-index/Makefile.am     |  12 ++++++------
 src/lib-mail/Makefile.am      |  42 +++++++++++++++++++++---------------------
 src/lib-storage/Makefile.am   |   2 +-
 src/plugins/fts/Makefile.am   |   2 +-
 8 files changed, 41 insertions(+), 41 deletions(-)

diffs (253 lines):

diff -r 4b0cbecf369d -r a2159b6d1518 src/doveadm/Makefile.am
--- a/src/doveadm/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/doveadm/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -37,7 +37,7 @@
 	../lib-otp/libotp.a
 
 libs = \
-	dsync/libdsync.a \
+	dsync/libdsync.la \
 	$(unused_objects)
 
 doveadm_LDADD = \
diff -r 4b0cbecf369d -r a2159b6d1518 src/doveadm/dsync/Makefile.am
--- a/src/doveadm/dsync/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/doveadm/dsync/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = libdsync.a
+noinst_LTLIBRARIES = libdsync.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
@@ -11,7 +11,7 @@
 	-I$(top_srcdir)/src/lib-storage \
 	-I$(top_srcdir)/src/doveadm
 
-libdsync_a_SOURCES = \
+libdsync_la_SOURCES = \
 	doveadm-dsync.c \
 	dsync-brain.c \
 	dsync-brain-mailbox.c \
@@ -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.o dsync-mailbox-tree.o $(test_libs)
-test_dsync_mailbox_tree_sync_DEPENDENCIES = $(noinst_LIBRARIES) $(test_libs)
+test_dsync_mailbox_tree_sync_LDADD = dsync-mailbox-tree-sync.lo dsync-mailbox-tree.lo $(test_libs)
+test_dsync_mailbox_tree_sync_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
 
 check: check-am check-test
 check-test: all-am
diff -r 4b0cbecf369d -r a2159b6d1518 src/lib-dict/Makefile.am
--- a/src/lib-dict/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/lib-dict/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -84,7 +84,7 @@
 	../lib/liblib.la
 
 test_dict_SOURCES = test-dict.c
-test_dict_LDADD = dict.o $(test_libs)
+test_dict_LDADD = dict.lo $(test_libs)
 test_dict_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
 
 check: check-am check-test
diff -r 4b0cbecf369d -r a2159b6d1518 src/lib-imap/Makefile.am
--- a/src/lib-imap/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/lib-imap/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -57,27 +57,27 @@
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_imap_bodystructure_SOURCES = test-imap-bodystructure.c
-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_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 = $(test_deps) ../lib-mail/libmail.la
 
 test_imap_match_SOURCES = test-imap-match.c
-test_imap_match_LDADD = imap-match.o $(test_libs)
+test_imap_match_LDADD = imap-match.lo $(test_libs)
 test_imap_match_DEPENDENCIES = $(test_deps)
 
 test_imap_parser_SOURCES = test-imap-parser.c
-test_imap_parser_LDADD = imap-parser.o imap-arg.o $(test_libs)
+test_imap_parser_LDADD = imap-parser.lo imap-arg.lo $(test_libs)
 test_imap_parser_DEPENDENCIES = $(test_deps)
 
 test_imap_url_SOURCES = test-imap-url.c
-test_imap_url_LDADD = imap-url.o  $(test_libs)
+test_imap_url_LDADD = imap-url.lo  $(test_libs)
 test_imap_url_DEPENDENCIES = $(test_deps)
 
 test_imap_utf7_SOURCES = test-imap-utf7.c
-test_imap_utf7_LDADD = imap-utf7.o $(test_libs)
+test_imap_utf7_LDADD = imap-utf7.lo $(test_libs)
 test_imap_utf7_DEPENDENCIES = $(test_deps)
 
 test_imap_util_SOURCES = test-imap-util.c
-test_imap_util_LDADD = imap-util.o imap-arg.o $(test_libs)
+test_imap_util_LDADD = imap-util.lo imap-arg.lo $(test_libs)
 test_imap_util_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
diff -r 4b0cbecf369d -r a2159b6d1518 src/lib-index/Makefile.am
--- a/src/lib-index/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/lib-index/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -70,30 +70,30 @@
 noinst_PROGRAMS = $(test_programs)
 
 test_libs = \
-	mail-index-util.o \
+	mail-index-util.lo \
 	../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.o $(test_libs)
+test_mail_index_sync_ext_LDADD = mail-index-sync-ext.lo $(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.o $(test_libs)
+test_mail_index_transaction_finish_LDADD = mail-index-transaction-finish.lo $(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.o $(test_libs)
+test_mail_index_transaction_update_LDADD = mail-index-transaction-update.lo $(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.o $(test_libs)
+test_mail_transaction_log_append_LDADD = mail-transaction-log-append.lo $(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.o $(test_libs)
+test_mail_transaction_log_view_LDADD = mail-transaction-log-view.lo $(test_libs)
 test_mail_transaction_log_view_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
diff -r 4b0cbecf369d -r a2159b6d1518 src/lib-mail/Makefile.am
--- a/src/lib-mail/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/lib-mail/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -90,74 +90,74 @@
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_istream_dot_SOURCES = test-istream-dot.c
-test_istream_dot_LDADD = istream-dot.o $(test_libs)
+test_istream_dot_LDADD = istream-dot.lo $(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.o quoted-printable.o $(test_libs)
+test_istream_qp_decoder_LDADD = istream-qp-decoder.lo quoted-printable.lo $(test_libs)
 test_istream_qp_decoder_DEPENDENCIES = $(test_deps)
 
 message_parser_objects = \
-	message-parser.o \
-	message-header-parser.o \
-	message-size.o \
-	rfc822-parser.o \
-	rfc2231-parser.o
+	message-parser.lo \
+	message-header-parser.lo \
+	message-size.lo \
+	rfc822-parser.lo \
+	rfc2231-parser.lo
 
 test_istream_binary_converter_SOURCES = test-istream-binary-converter.c
-test_istream_binary_converter_LDADD = istream-binary-converter.o $(message_parser_objects)  $(test_libs)
+test_istream_binary_converter_LDADD = istream-binary-converter.lo $(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.o istream-attachment-connector.o $(message_parser_objects) $(test_libs)
+test_istream_attachment_LDADD = istream-attachment-extractor.lo istream-attachment-connector.lo $(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.o message-header-parser.o $(test_libs)
+test_istream_header_filter_LDADD = istream-header-filter.lo message-header-parser.lo $(test_libs)
 test_istream_header_filter_DEPENDENCIES = $(test_deps)
 
 test_mbox_from_SOURCES = test-mbox-from.c
-test_mbox_from_LDADD = mbox-from.o $(test_libs)
+test_mbox_from_LDADD = mbox-from.lo $(test_libs)
 test_mbox_from_DEPENDENCIES = $(test_deps)
 
 test_message_address_SOURCES = test-message-address.c
-test_message_address_LDADD = message-address.o rfc822-parser.o $(test_libs)
+test_message_address_LDADD = message-address.lo rfc822-parser.lo $(test_libs)
 test_message_address_DEPENDENCIES = $(test_deps)
 
 test_message_date_SOURCES = test-message-date.c
-test_message_date_LDADD = message-date.o rfc822-parser.o $(test_libs)
+test_message_date_LDADD = message-date.lo rfc822-parser.lo $(test_libs)
 test_message_date_DEPENDENCIES = $(test_deps)
 
 test_message_decoder_SOURCES = test-message-decoder.c
-test_message_decoder_LDADD = message-decoder.o rfc822-parser.o rfc2231-parser.o $(test_libs)
+test_message_decoder_LDADD = message-decoder.lo rfc822-parser.lo rfc2231-parser.lo $(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.o quoted-printable.o $(test_libs)
+test_message_header_decode_LDADD = message-header-decode.lo quoted-printable.lo $(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.o $(test_libs)
+test_message_header_encode_LDADD = message-header-encode.lo $(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.o $(test_libs)
+test_message_header_parser_LDADD = message-header-parser.lo $(test_libs)
 test_message_header_parser_DEPENDENCIES = $(test_deps)
 
 test_message_id_SOURCES = test-message-id.c
-test_message_id_LDADD = message-id.o rfc822-parser.o $(test_libs)
+test_message_id_LDADD = message-id.lo rfc822-parser.lo $(test_libs)
 test_message_id_DEPENDENCIES = $(test_deps)
 
 test_message_parser_SOURCES = test-message-parser.c
-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_LDADD = message-parser.lo message-header-parser.lo message-size.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
 test_message_parser_DEPENDENCIES = $(test_deps)
 
 test_quoted_printable_SOURCES = test-quoted-printable.c
-test_quoted_printable_LDADD = quoted-printable.o $(test_libs)
+test_quoted_printable_LDADD = quoted-printable.lo $(test_libs)
 test_quoted_printable_DEPENDENCIES = $(test_deps)
 
 test_rfc2231_parser_SOURCES = test-rfc2231-parser.c
-test_rfc2231_parser_LDADD = rfc2231-parser.o rfc822-parser.o $(test_libs)
+test_rfc2231_parser_LDADD = rfc2231-parser.lo rfc822-parser.lo $(test_libs)
 test_rfc2231_parser_DEPENDENCIES = $(test_deps)
 
 check: check-am check-test
diff -r 4b0cbecf369d -r a2159b6d1518 src/lib-storage/Makefile.am
--- a/src/lib-storage/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/lib-storage/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -103,7 +103,7 @@
 	$(top_builddir)/src/lib/liblib.la
 
 test_mailbox_get_SOURCES = test-mailbox-get.c
-test_mailbox_get_LDADD = mailbox-get.o $(test_libs)
+test_mailbox_get_LDADD = mailbox-get.lo $(test_libs)
 test_mailbox_get_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
 
 check: check-am check-test
diff -r 4b0cbecf369d -r a2159b6d1518 src/plugins/fts/Makefile.am
--- a/src/plugins/fts/Makefile.am	Sun Sep 16 16:31:32 2012 +0300
+++ b/src/plugins/fts/Makefile.am	Sun Sep 16 16:42:25 2012 +0300
@@ -47,7 +47,7 @@
 
 xml2text_SOURCES = xml2text.c
 
-xml2text_LDADD = fts-parser-html.o $(LIBDOVECOT)
+xml2text_LDADD = fts-parser-html.lo $(LIBDOVECOT)
 xml2text_DEPENDENCIES = $(module_LTLIBRARIES) $(LIBDOVECOT_DEPS)
 
 pkglibexec_SCRIPTS = decode2text.sh

More information about the dovecot-cvs mailing list