diff options
| -rw-r--r-- | doc/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/Makefile.am | 18 | ||||
| -rw-r--r-- | src/Makefile.am | 28 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/suite/Makefile.am | 2 |
6 files changed, 33 insertions, 27 deletions
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 29f612f986..6f42a1fbc5 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -37,8 +37,8 @@ LDADD = libexamples.la \ ../../gl/libgnu.la \ $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB) -CXX_LDADD = $(LDADD) \ - ../../lib/libgnutlsxx.la +CXX_LDADD = ../../lib/libgnutlsxx.la \ + $(LDADD) noinst_PROGRAMS = ex-client-resume ex-client-dtls noinst_PROGRAMS += ex-cert-select ex-client-x509 diff --git a/extra/Makefile.am b/extra/Makefile.am index 98421b0461..8cbb4050cb 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -53,7 +53,7 @@ lib_LTLIBRARIES = libgnutls-openssl.la libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h \ openssl_compat.c -libgnutls_openssl_la_LIBADD = ../gl/libgnu.la $(LIBSOCKET) \ +libgnutls_openssl_la_LIBADD = ../gl/libgnu.la \ ../lib/libgnutls.la libgnutls_openssl_la_LDFLAGS += -version-info $(LT_SSL_CURRENT):$(LT_SSL_REVISION):$(LT_SSL_AGE) @@ -61,9 +61,11 @@ libgnutls_openssl_la_LDFLAGS += -version-info $(LT_SSL_CURRENT):$(LT_SSL_REVISIO if ENABLE_MINITASN1 libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la else -libgnutls_openssl_la_LDFLAGS += $(LTLIBTASN1) +libgnutls_openssl_la_LIBADD += $(LTLIBTASN1) endif +libgnutls_openssl_la_LIBADD += $(LIBSOCKET) + if HAVE_LD_OUTPUT_DEF libgnutls_openssl_la_LDFLAGS += \ -Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def diff --git a/lib/Makefile.am b/lib/Makefile.am index d0951d44d2..41adaba096 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -118,15 +118,11 @@ libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(SRP_COBJECTS) \ libgnutls_la_LDFLAGS = -no-undefined \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -if WINDOWS -libgnutls_la_LDFLAGS += -lcrypt32 -endif - libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \ accelerated/libaccelerated.la ext/libgnutls_ext.la \ auth/libgnutls_auth.la algorithms/libgnutls_alg.la \ - extras/libgnutls_extras.la \ - $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \ + extras/libgnutls_extras.la +thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \ $(LTLIBPTHREAD) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_LIBS) if ENABLE_OPENPGP @@ -143,11 +139,11 @@ endif if ENABLE_MINITASN1 libgnutls_la_LIBADD += minitasn1/libminitasn1.la else -libgnutls_la_LDFLAGS += $(LIBTASN1_LIBS) +thirdparty_libadd += $(LIBTASN1_LIBS) endif if ENABLE_NETTLE -libgnutls_la_LDFLAGS += $(LTLIBNETTLE) +thirdparty_libadd += $(LTLIBNETTLE) libgnutls_la_LIBADD += nettle/libcrypto.la endif @@ -159,6 +155,12 @@ defexec_DATA = libgnutls-$(DLL_VERSION).def DISTCLEANFILES += $(defexec_DATA) endif +if WINDOWS +thirdparty_libadd += -lcrypt32 +endif + +libgnutls_la_LIBADD += $(thirdparty_libadd) + # C++ library if ENABLE_CXX diff --git a/src/Makefile.am b/src/Makefile.am index 3f16b2e72b..5a11ebee3e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -63,7 +63,8 @@ gnutls_serv_SOURCES = \ common.h common.c \ certtool-common.h gnutls_serv_LDADD = ../lib/libgnutls.la -gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LIBOPTS_LDADD) $(LTLIBINTL) +gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la +gnutls_serv_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) noinst_LTLIBRARIES += libcmd-serv.la libcmd_serv_la_CFLAGS = @@ -111,8 +112,9 @@ libcmd_cli_la_SOURCES = cli-args.def cli-args.c cli-args.h gnutls_cli_debug_SOURCES = tls_test.c tests.h tests.c \ socket.c socket.h common.h common.c gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la +gnutls_cli_debug_LDADD += ../gl/libgnu.la gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -gnutls_cli_debug_LDADD += ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) +gnutls_cli_debug_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) noinst_LTLIBRARIES += libcmd-cli-debug.la libcmd_cli_debug_la_CFLAGS = libcmd_cli_debug_la_SOURCES = cli-debug-args.def cli-debug-args.c cli-debug-args.h @@ -127,42 +129,42 @@ noinst_LTLIBRARIES += libcmd-certtool.la libcmd_certtool_la_CFLAGS = libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.def certtool-args.h \ certtool-cfg.h certtool-cfg.c -libcmd_certtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE) +libcmd_certtool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -libcmd_certtool_la_LIBADD += ../lib/libgnutls.la -libcmd_certtool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB) +libcmd_certtool_la_LIBADD += $(LTLIBREADLINE) +libcmd_certtool_la_LIBADD += $(INET_PTON_LIB) # p11 tool if ENABLE_PKCS11 p11tool_SOURCES = p11tool-args.def p11tool.c pkcs11.c certtool-common.c \ certtool-extras.c p11tool.h common.c -p11tool_LDADD = ../lib/libgnutls.la $(LIBOPTS_LDADD) $(LTLIBINTL) +p11tool_LDADD = ../lib/libgnutls.la p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la +p11tool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) noinst_LTLIBRARIES += libcmd-p11tool.la libcmd_p11tool_la_CFLAGS = libcmd_p11tool_la_SOURCES = p11tool-args.def p11tool-args.c p11tool-args.h \ certtool-cfg.h certtool-cfg.c -libcmd_p11tool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE) -libcmd_p11tool_la_LIBADD += ../lib/libgnutls.la -libcmd_p11tool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB) +libcmd_p11tool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la +libcmd_p11tool_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) endif # ENABLE_PKCS11 if ENABLE_TROUSERS tpmtool_SOURCES = tpmtool-args.def tpmtool.c certtool-common.c certtool-extras.c common.c -tpmtool_LDADD = ../lib/libgnutls.la $(LIBOPTS_LDADD) $(LTLIBINTL) +tpmtool_LDADD = ../lib/libgnutls.la tpmtool_LDADD += libcmd-tpmtool.la ../gl/libgnu.la +tpmtool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) noinst_LTLIBRARIES += libcmd-tpmtool.la libcmd_tpmtool_la_CFLAGS = libcmd_tpmtool_la_SOURCES = tpmtool-args.def tpmtool-args.c tpmtool-args.h \ certtool-cfg.h certtool-cfg.c -libcmd_tpmtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE) -libcmd_tpmtool_la_LIBADD += ../lib/libgnutls.la -libcmd_tpmtool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB) +libcmd_tpmtool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la +libcmd_tpmtool_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) endif # ENABLE_TROUSERS diff --git a/tests/Makefile.am b/tests/Makefile.am index b118dd4d92..2e797a9a7c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -78,7 +78,7 @@ endif if ENABLE_OPENSSL ctests += openssl -openssl_LDADD = $(LDADD) ../extra/libgnutls-openssl.la +openssl_LDADD = ../extra/libgnutls-openssl.la $(LDADD) endif if ENABLE_OPENPGP diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index 0ed7437fbb..6004b9c458 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -81,7 +81,7 @@ nodist_libecore_la_SOURCES = ecore/src/lib/ecore_anim.c \ ecore/src/lib/eina_unicode.c ecore/src/lib/eina_ustrbuf.c \ ecore/src/lib/eina_ustringshare.c ecore/src/lib/eina_value.c -eagain_cli_LDADD = $(LDADD) libecore.la -lrt -lm -ldl -lpthread +eagain_cli_LDADD = libecore.la -lrt -lm -ldl -lpthread $(LDADD) nodist_eagain_cli_SOURCES = mini-eagain2.c noinst_PROGRAMS = eagain-cli |