From 9adc6d64588e32b6becf3c94f30c0a1b05702687 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sat, 27 Dec 2014 16:52:25 -0600 Subject: Revert "do not double-link libcrypto" This reverts commit c83d468cfd5d3ca60a499b69c0b7c9d0b159d405. It wasn't as superfluous as I thought on all platforms. --- apps/Makefile.am | 1 + tests/Makefile.am.tpl | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/Makefile.am b/apps/Makefile.am index 16f88ad..769a033 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am @@ -5,6 +5,7 @@ bin_PROGRAMS = openssl openssl_CFLAGS = $(USER_CFLAGS) openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) openssl_LDADD += $(top_builddir)/ssl/libssl.la +openssl_LDADD += $(top_builddir)/crypto/libcrypto.la openssl_SOURCES = apps.c openssl_SOURCES += asn1pars.c diff --git a/tests/Makefile.am.tpl b/tests/Makefile.am.tpl index fb3986b..b2a4920 100644 --- a/tests/Makefile.am.tpl +++ b/tests/Makefile.am.tpl @@ -5,6 +5,7 @@ AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) LDADD += $(top_builddir)/ssl/libssl.la +LDADD += $(top_builddir)/crypto/libcrypto.la TESTS = check_PROGRAMS = -- cgit v1.2.3-55-g6feb