diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-07-21 05:40:28 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-07-21 19:53:52 -0500 |
| commit | 4335a49f515e860bdb3181e4562947cbd4032272 (patch) | |
| tree | f5a16b6fd9d72c8f33454e84d7a803a9fe69fa0b | |
| parent | 8a44ab84f00ca5c71fe4f2ec0b91443d52680124 (diff) | |
| download | portable-4335a49f515e860bdb3181e4562947cbd4032272.tar.gz portable-4335a49f515e860bdb3181e4562947cbd4032272.tar.bz2 portable-4335a49f515e860bdb3181e4562947cbd4032272.zip | |
use correct link order for app and tests
ok beck@ guenther@
| -rw-r--r-- | apps/Makefile.am.tpl | 2 | ||||
| -rwxr-xr-x | 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 | |||
| 4 | 4 | ||
| 5 | openssl_CFLAGS = $(USER_CFLAGS) | 5 | openssl_CFLAGS = $(USER_CFLAGS) |
| 6 | openssl_LDADD = $(PLATFORM_LDADD) | 6 | openssl_LDADD = $(PLATFORM_LDADD) |
| 7 | openssl_LDADD += $(top_builddir)/crypto/libcrypto.la | ||
| 8 | openssl_LDADD += $(top_builddir)/ssl/libssl.la | 7 | openssl_LDADD += $(top_builddir)/ssl/libssl.la |
| 8 | openssl_LDADD += $(top_builddir)/crypto/libcrypto.la | ||
| 9 | 9 | ||
| 10 | openssl_SOURCES = | 10 | openssl_SOURCES = |
| 11 | noinst_HEADERS = | 11 | noinst_HEADERS = |
| @@ -309,8 +309,8 @@ test_excludes=(biotest aeadtest evptest pq_test ssltest arc4randomforktest fork_ | |||
| 309 | fi | 309 | fi |
| 310 | echo "check_PROGRAMS += $TEST" >> Makefile.am | 310 | echo "check_PROGRAMS += $TEST" >> Makefile.am |
| 311 | echo "${TEST}_SOURCES = $i" >> Makefile.am | 311 | echo "${TEST}_SOURCES = $i" >> Makefile.am |
| 312 | echo "${TEST}_LDADD = \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am | 312 | echo "${TEST}_LDADD = \$(top_builddir)/ssl/libssl.la" >> Makefile.am |
| 313 | echo "${TEST}_LDADD += \$(top_builddir)/ssl/libssl.la" >> Makefile.am | 313 | echo "${TEST}_LDADD += \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am |
| 314 | done | 314 | done |
| 315 | ) | 315 | ) |
| 316 | $CP $libcrypto_regress/evp/evptests.txt tests | 316 | $CP $libcrypto_regress/evp/evptests.txt tests |