|
3267
|
1 diff -ur a/src/Makefile.am b/src/Makefile.am |
|
|
2 --- a/src/Makefile.am 2013-03-03 04:04:09.000000000 -0500 |
|
|
3 +++ b/src/Makefile.am 2013-10-16 23:34:43.999201873 -0400 |
|
|
4 @@ -67,7 +67,7 @@ |
|
|
5 if ENABLE_SRP |
|
|
6 srptool_SOURCES = srptool.c |
|
|
7 srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la |
|
|
8 -srptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
9 +srptool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
10 noinst_LTLIBRARIES += libcmd-srp.la |
|
|
11 libcmd_srp_la_CFLAGS = |
|
|
12 libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h |
|
|
13 @@ -75,7 +75,7 @@ |
|
|
14 |
|
|
15 psktool_SOURCES = psk.c |
|
|
16 psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la |
|
|
17 -psktool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
18 +psktool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
19 noinst_LTLIBRARIES += libcmd-psk.la |
|
|
20 libcmd_psk_la_CFLAGS = |
|
|
21 libcmd_psk_la_SOURCES = psk-args.def psk-args.c psk-args.h |
|
|
22 @@ -86,7 +86,7 @@ |
|
|
23 ocsptool_SOURCES = ocsptool.c ocsptool-common.h ocsptool-common.c \ |
|
|
24 socket.c socket.h |
|
|
25 ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la ../gl/libgnu.la |
|
|
26 -ocsptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) $(GETADDRINFO_LIB) |
|
|
27 +ocsptool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) $(GETADDRINFO_LIB) |
|
|
28 noinst_LTLIBRARIES += libcmd-ocsp.la |
|
|
29 libcmd_ocsp_la_CFLAGS = |
|
|
30 libcmd_ocsp_la_SOURCES = ocsptool-args.def ocsptool-args.h ocsptool-args.c |
|
|
31 @@ -99,7 +99,7 @@ |
|
|
32 certtool-common.h |
|
|
33 gnutls_serv_LDADD = ../lib/libgnutls.la |
|
|
34 gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la |
|
|
35 -gnutls_serv_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
36 +gnutls_serv_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
37 gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) |
|
|
38 noinst_LTLIBRARIES += libcmd-serv.la |
|
|
39 libcmd_serv_la_CFLAGS = |
|
|
40 @@ -116,7 +116,7 @@ |
|
|
41 if ENABLE_DANE |
|
|
42 gnutls_cli_LDADD += ../libdane/libgnutls-dane.la |
|
|
43 endif |
|
|
44 -gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
45 +gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
46 gnutls_cli_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIB_CLOCK_GETTIME) \ |
|
|
47 $(SERVENT_LIB) |
|
|
48 noinst_LTLIBRARIES += libcmd-cli.la |
|
|
49 @@ -129,7 +129,7 @@ |
|
|
50 socket.c socket.h common.h common.c |
|
|
51 gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la |
|
|
52 gnutls_cli_debug_LDADD += ../gl/libgnu.la |
|
|
53 -gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
54 +gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
55 gnutls_cli_debug_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) |
|
|
56 noinst_LTLIBRARIES += libcmd-cli-debug.la |
|
|
57 libcmd_cli_debug_la_CFLAGS = |
|
|
58 @@ -146,7 +146,7 @@ |
|
|
59 libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.def certtool-args.h \ |
|
|
60 certtool-cfg.h certtool-cfg.c |
|
|
61 libcmd_certtool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la |
|
|
62 -libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
63 +libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
64 libcmd_certtool_la_LIBADD += $(LTLIBREADLINE) |
|
|
65 libcmd_certtool_la_LIBADD += $(INET_PTON_LIB) |
|
|
66 |
|
|
67 @@ -162,7 +162,7 @@ |
|
|
68 libcmd_danetool_la_SOURCES = danetool-args.c danetool-args.def danetool-args.h \ |
|
|
69 certtool-cfg.h certtool-cfg.c |
|
|
70 libcmd_danetool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la |
|
|
71 -libcmd_danetool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
72 +libcmd_danetool_la_LIBADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
73 libcmd_danetool_la_LIBADD += $(LTLIBREADLINE) |
|
|
74 libcmd_danetool_la_LIBADD += $(INET_PTON_LIB) |
|
|
75 |
|
|
76 @@ -173,7 +173,7 @@ |
|
|
77 certtool-extras.c p11tool.h common.c |
|
|
78 p11tool_LDADD = ../lib/libgnutls.la |
|
|
79 p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la |
|
|
80 -p11tool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
81 +p11tool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
82 |
|
|
83 noinst_LTLIBRARIES += libcmd-p11tool.la |
|
|
84 libcmd_p11tool_la_CFLAGS = |
|
|
85 @@ -189,7 +189,7 @@ |
|
|
86 tpmtool_SOURCES = tpmtool-args.def tpmtool.c certtool-common.c certtool-extras.c common.c |
|
|
87 tpmtool_LDADD = ../lib/libgnutls.la |
|
|
88 tpmtool_LDADD += libcmd-tpmtool.la ../gl/libgnu.la |
|
|
89 -tpmtool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) |
|
|
90 +tpmtool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) |
|
|
91 |
|
|
92 noinst_LTLIBRARIES += libcmd-tpmtool.la |
|
|
93 libcmd_tpmtool_la_CFLAGS = |
