blob: 8371a6ee67f2e425e5255e7c10a9f6bcf38076f2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
Upstream-commit: https://github.com/dovecot/core/commit/d5f5cd32bafc18a28a7edbe1dbe559f8abe55323
From d5f5cd32bafc18a28a7edbe1dbe559f8abe55323 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 25 Jul 2022 19:47:34 +0300
Subject: [PATCH] lib-index: Makefile.am - Fix double-linking of
mail-index-util.o
This fixes linking with slibtool.
---
src/lib-index/Makefile.am | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/lib-index/Makefile.am b/src/lib-index/Makefile.am
index f203201bf7..a4af01715b 100644
--- a/src/lib-index/Makefile.am
+++ b/src/lib-index/Makefile.am
@@ -79,10 +79,13 @@ test_programs = \
noinst_PROGRAMS = $(test_programs)
test_libs = \
- mail-index-util.lo \
../lib-test/libtest.la \
../lib/liblib.la
+test_minimal_libs = \
+ mail-index-util.lo \
+ $(test_libs)
+
test_deps = $(noinst_LTLIBRARIES) $(test_libs)
test_mail_cache_SOURCES = test-mail-cache-common.c test-mail-cache.c
@@ -114,19 +117,19 @@ test_mail_index_sync_ext_LDADD = $(noinst_LTLIBRARIES) $(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_LDADD = mail-index-transaction-finish.lo $(test_minimal_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_LDADD = mail-index-transaction-update.lo $(test_minimal_libs)
test_mail_index_transaction_update_DEPENDENCIES = $(test_deps)
test_mail_index_write_SOURCES = test-mail-index-write.c
-test_mail_index_write_LDADD = mail-index-write.lo $(test_libs)
+test_mail_index_write_LDADD = mail-index-write.lo $(test_minimal_libs)
test_mail_index_write_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_LDADD = mail-transaction-log-append.lo $(test_minimal_libs)
test_mail_transaction_log_append_DEPENDENCIES = $(test_deps)
test_mail_transaction_log_file_SOURCES = test-mail-transaction-log-file.c
@@ -134,7 +137,7 @@ test_mail_transaction_log_file_LDADD = $(noinst_LTLIBRARIES) $(test_libs)
test_mail_transaction_log_file_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_LDADD = mail-transaction-log-view.lo $(test_minimal_libs)
test_mail_transaction_log_view_DEPENDENCIES = $(test_deps)
check-local:
|
