aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2014-10-29 15:46:20 -0500
committerBrent Cook <bcook@openbsd.org>2014-10-30 10:55:30 -0500
commit72c1e56b382547c74e16a67d1d2b1b7ce774c56d (patch)
tree3c97531f4bd3d039de5114357af964f016190d1b
parentccaf9cdd9c161c80c27907f7782d86cfe9625621 (diff)
downloadportable-72c1e56b382547c74e16a67d1d2b1b7ce774c56d.tar.gz
portable-72c1e56b382547c74e16a67d1d2b1b7ce774c56d.tar.bz2
portable-72c1e56b382547c74e16a67d1d2b1b7ce774c56d.zip
enable -lcrypto -lssl with all test programs directly.
This removes the need to specify each one individually. ok doug@
-rw-r--r--tests/Makefile.am.tpl3
-rwxr-xr-xupdate.sh2
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
3AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes 3AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
4AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 4AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
5 5
6LDADD = $(top_builddir)/ssl/libssl.la
7LDADD += $(top_builddir)/crypto/libcrypto.la
8
6TESTS = 9TESTS =
7check_PROGRAMS = 10check_PROGRAMS =
8EXTRA_DIST = 11EXTRA_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/
318 fi 318 fi
319 echo "check_PROGRAMS += $TEST" >> Makefile.am 319 echo "check_PROGRAMS += $TEST" >> Makefile.am
320 echo "${TEST}_SOURCES = $i" >> Makefile.am 320 echo "${TEST}_SOURCES = $i" >> Makefile.am
321 echo "${TEST}_LDADD = \$(top_builddir)/ssl/libssl.la" >> Makefile.am
322 echo "${TEST}_LDADD += \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am
323 done 321 done
324 echo "if NO_MEMMEM" >> Makefile.am 322 echo "if NO_MEMMEM" >> Makefile.am
325 echo "explicit_bzero_SOURCES += memmem.c" >> Makefile.am 323 echo "explicit_bzero_SOURCES += memmem.c" >> Makefile.am