From 72c1e56b382547c74e16a67d1d2b1b7ce774c56d Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 29 Oct 2014 15:46:20 -0500 Subject: enable -lcrypto -lssl with all test programs directly. This removes the need to specify each one individually. ok doug@ --- tests/Makefile.am.tpl | 3 +++ update.sh | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am.tpl b/tests/Makefile.am.tpl index 06d48c1..52df298 100644 --- a/tests/Makefile.am.tpl +++ b/tests/Makefile.am.tpl @@ -3,6 +3,9 @@ include $(top_srcdir)/Makefile.am.common AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 +LDADD = $(top_builddir)/ssl/libssl.la +LDADD += $(top_builddir)/crypto/libcrypto.la + TESTS = check_PROGRAMS = EXTRA_DIST = diff --git a/update.sh b/update.sh index 661bf02..166f609 100755 --- a/update.sh +++ b/update.sh @@ -318,8 +318,6 @@ $CP $libc_src/string/memmem.c tests/ fi echo "check_PROGRAMS += $TEST" >> Makefile.am echo "${TEST}_SOURCES = $i" >> Makefile.am - echo "${TEST}_LDADD = \$(top_builddir)/ssl/libssl.la" >> Makefile.am - echo "${TEST}_LDADD += \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am done echo "if NO_MEMMEM" >> Makefile.am echo "explicit_bzero_SOURCES += memmem.c" >> Makefile.am -- cgit v1.2.3-55-g6feb