diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-12-27 16:34:48 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-12-27 16:34:48 -0600 |
| commit | c83d468cfd5d3ca60a499b69c0b7c9d0b159d405 (patch) | |
| tree | 6222349f1cc42e844b9a8e469c44a4826c150f79 | |
| parent | 23c90228ac36f6afeb4fbeb5b4891dad120fec4b (diff) | |
| download | portable-c83d468cfd5d3ca60a499b69c0b7c9d0b159d405.tar.gz portable-c83d468cfd5d3ca60a499b69c0b7c9d0b159d405.tar.bz2 portable-c83d468cfd5d3ca60a499b69c0b7c9d0b159d405.zip | |
do not double-link libcrypto
libssl already has LIBFLAGS for libcrypto, so adding -lcrypto is superfluous.
| -rw-r--r-- | apps/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/Makefile.am.tpl | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/apps/Makefile.am b/apps/Makefile.am index 769a033..16f88ad 100644 --- a/apps/Makefile.am +++ b/apps/Makefile.am | |||
| @@ -5,7 +5,6 @@ bin_PROGRAMS = openssl | |||
| 5 | openssl_CFLAGS = $(USER_CFLAGS) | 5 | openssl_CFLAGS = $(USER_CFLAGS) |
| 6 | openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 6 | openssl_LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) |
| 7 | openssl_LDADD += $(top_builddir)/ssl/libssl.la | 7 | openssl_LDADD += $(top_builddir)/ssl/libssl.la |
| 8 | openssl_LDADD += $(top_builddir)/crypto/libcrypto.la | ||
| 9 | 8 | ||
| 10 | openssl_SOURCES = apps.c | 9 | openssl_SOURCES = apps.c |
| 11 | openssl_SOURCES += asn1pars.c | 10 | openssl_SOURCES += asn1pars.c |
diff --git a/tests/Makefile.am.tpl b/tests/Makefile.am.tpl index b2a4920..fb3986b 100644 --- a/tests/Makefile.am.tpl +++ b/tests/Makefile.am.tpl | |||
| @@ -5,7 +5,6 @@ AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1 | |||
| 5 | 5 | ||
| 6 | LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) | 6 | LDADD = $(PLATFORM_LDADD) $(PROG_LDADD) |
| 7 | LDADD += $(top_builddir)/ssl/libssl.la | 7 | LDADD += $(top_builddir)/ssl/libssl.la |
| 8 | LDADD += $(top_builddir)/crypto/libcrypto.la | ||
| 9 | 8 | ||
| 10 | TESTS = | 9 | TESTS = |
| 11 | check_PROGRAMS = | 10 | check_PROGRAMS = |