libssl depends on libcrypto, not the other way around.

This commit is contained in:
Peter Rosin 2011-05-04 16:34:28 +02:00 committed by Nick Mathewson
parent d11e9e0f71
commit 274dd0369a
4 changed files with 4 additions and 4 deletions

View File

@ -201,7 +201,7 @@ libevent_extra_la_LDFLAGS = $(GENERIC_LDFLAGS)
if OPENSSL if OPENSSL
libevent_openssl_la_SOURCES = bufferevent_openssl.c libevent_openssl_la_SOURCES = bufferevent_openssl.c
libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lcrypto -lssl libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lssl -lcrypto
libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS) libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS)
endif endif

View File

@ -11,6 +11,6 @@ Version: @VERSION@
Requires: libevent Requires: libevent
Conflicts: Conflicts:
Libs: -L${libdir} -levent_openssl Libs: -L${libdir} -levent_openssl
Libs.private: @LIBS@ -lcrypto -lssl Libs.private: @LIBS@ -lssl -lcrypto
Cflags: -I${includedir} Cflags: -I${includedir}

View File

@ -15,7 +15,7 @@ http_server_sources = http-server.c
if OPENSSL if OPENSSL
noinst_PROGRAMS += le-proxy noinst_PROGRAMS += le-proxy
le_proxy_sources = le-proxy.c le_proxy_sources = le-proxy.c
le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lcrypto -lssl le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto
endif endif
verify: verify:

View File

@ -60,7 +60,7 @@ regress_LDFLAGS = $(PTHREAD_CFLAGS)
if OPENSSL if OPENSSL
regress_SOURCES += regress_ssl.c regress_SOURCES += regress_ssl.c
regress_LDADD += ../libevent_openssl.la -lcrypto -lssl regress_LDADD += ../libevent_openssl.la -lssl -lcrypto
endif endif
bench_SOURCES = bench.c bench_SOURCES = bench.c