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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
| | From e350540c9e2259e2f66cbaf7c6dc347f03acac40 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 25 Apr 2023 17:41:47 +0200
Subject: [PATCH] Fix the build system to avoid undefined references on mingw.
---
p11-kit/Makefile.am | 23 ++++++++++++-----------
trust/Makefile.am | 5 ++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 7fe7a6c..017edd3 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -13,6 +13,7 @@ COMMON_SRCS = \
p11-kit/conf.c p11-kit/conf.h \
p11-kit/iter.c \
p11-kit/log.c p11-kit/log.h \
+ p11-kit/lists.c \
p11-kit/filter.c p11-kit/filter.h \
p11-kit/modules.c p11-kit/modules.h \
p11-kit/pkcs11.h \
@@ -80,6 +81,7 @@ COMMON_CFLAGS = \
COMMON_LIBS = \
libp11-common.la \
libp11-library.la \
+ libp11-tool.la \
$(LIBFFI_LIBS) \
$(LTLIBINTL) \
$(NULL)
@@ -125,7 +127,8 @@ libp11_kit_testable_la_SOURCES = \
$(libp11_kit_internal_la_SOURCES) \
$(libp11_kit_la_SOURCES) \
$(NULL)
-libp11_kit_testable_la_LIBADD = $(COMMON_LIBS)
+libp11_kit_testable_la_LIBADD = $(COMMON_LIBS) \
+ libp11-tool.la
pkcs11_gnu_sources = \
p11-kit/uri.gnu.c \
@@ -238,14 +241,12 @@ EXTRA_DIST += \
bin_PROGRAMS += p11-kit/p11-kit
p11_kit_p11_kit_SOURCES = \
- p11-kit/lists.c \
p11-kit/p11-kit.c \
$(NULL)
p11_kit_p11_kit_LDADD = \
- libp11-kit.la \
- libp11-tool.la \
- libp11-common.la \
+ libp11-kit-internal.la \
+ $(COMMON_LIBS) \
$(LTLIBINTL) \
$(NULL)
@@ -257,12 +258,12 @@ private_PROGRAMS += p11-kit/p11-kit-remote
p11_kit_p11_kit_remote_SOURCES = \
p11-kit/remote.c \
+ $(libp11_kit_la_SOURCES) \
$(NULL)
p11_kit_p11_kit_remote_LDADD = \
- libp11-tool.la \
- libp11-common.la \
- libp11-kit.la \
+ libp11-kit-internal.la \
+ $(COMMON_LIBS) \
$(NULL)
check_PROGRAMS += p11-kit/p11-kit-remote-testable
@@ -278,12 +279,12 @@ private_PROGRAMS += p11-kit/p11-kit-server
p11_kit_p11_kit_server_SOURCES = \
p11-kit/server.c \
+ $(libp11_kit_la_SOURCES) \
$(NULL)
p11_kit_p11_kit_server_LDADD = \
- libp11-tool.la \
- libp11-common.la \
- libp11-kit.la \
+ libp11-kit-internal.la \
+ $(COMMON_LIBS) \
$(LIBSYSTEMD_LIBS) \
$(NULL)
diff --git a/trust/Makefile.am b/trust/Makefile.am
index 6ff5d12..f5d87f5 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -84,9 +84,8 @@ bin_PROGRAMS += trust/trust
trust_trust_LDADD = \
libtrust-data.la \
- libp11-kit.la \
- libp11-common.la \
- libp11-tool.la \
+ libp11-kit-internal.la \
+ $(COMMON_LIBS) \
$(LTLIBINTL) \
$(LIBTASN1_LIBS) \
$(HASH_LIBS) \
--
2.39.2
|