From 4335a49f515e860bdb3181e4562947cbd4032272 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 21 Jul 2014 05:40:28 -0500 Subject: use correct link order for app and tests ok beck@ guenther@ --- apps/Makefile.am.tpl | 2 +- update.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/Makefile.am.tpl b/apps/Makefile.am.tpl index 7222c18..9bc7b2e 100644 --- a/apps/Makefile.am.tpl +++ b/apps/Makefile.am.tpl @@ -4,8 +4,8 @@ bin_PROGRAMS = openssl openssl_CFLAGS = $(USER_CFLAGS) openssl_LDADD = $(PLATFORM_LDADD) -openssl_LDADD += $(top_builddir)/crypto/libcrypto.la openssl_LDADD += $(top_builddir)/ssl/libssl.la +openssl_LDADD += $(top_builddir)/crypto/libcrypto.la openssl_SOURCES = noinst_HEADERS = diff --git a/update.sh b/update.sh index 0c1f33f..660128e 100755 --- a/update.sh +++ b/update.sh @@ -309,8 +309,8 @@ test_excludes=(biotest aeadtest evptest pq_test ssltest arc4randomforktest fork_ fi echo "check_PROGRAMS += $TEST" >> Makefile.am echo "${TEST}_SOURCES = $i" >> Makefile.am - echo "${TEST}_LDADD = \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am - echo "${TEST}_LDADD += \$(top_builddir)/ssl/libssl.la" >> Makefile.am + echo "${TEST}_LDADD = \$(top_builddir)/ssl/libssl.la" >> Makefile.am + echo "${TEST}_LDADD += \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am done ) $CP $libcrypto_regress/evp/evptests.txt tests -- cgit v1.2.3-55-g6feb