Record inter-library dependencies between libcrypto, libssl and libtls

diff --git a/lib/libcrypto/crypto/shlib_version b/lib/libcrypto/crypto/shlib_version
index ed8f747..ae05223 100644 (file)
--- a/lib/libcrypto/crypto/shlib_version
+++ b/lib/libcrypto/crypto/shlib_version
@@ -1,2 +1,3 @@
+# Don't forget to give libssl and libtls the same type of bump!
 major=33
 minor=0

diff --git a/lib/libcrypto/shlib_version b/lib/libcrypto/shlib_version
index ed8f747..ae05223 100644 (file)
--- a/lib/libcrypto/shlib_version
+++ b/lib/libcrypto/shlib_version
@@ -1,2 +1,3 @@
+# Don't forget to give libssl and libtls the same type of bump!
 major=33
 minor=0

diff --git a/lib/libssl/shlib_version b/lib/libssl/shlib_version
index 2e4d25c..b491ec8 100644 (file)
--- a/lib/libssl/shlib_version
+++ b/lib/libssl/shlib_version
@@ -1,2 +1,3 @@
+# Don't forget to give libtls the same type of bump!
 major=32
 minor=0

diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 3dbd476..5a17ff2 100644 (file)
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2015/02/07 03:26:06 jsing Exp $
+# $OpenBSD: Makefile,v 1.50 2015/05/17 22:39:39 kettenis Exp $
 
 LIB=   ssl
 
@@ -13,6 +13,8 @@ CFLAGS+= -Werror
 CFLAGS+= -DLIBRESSL_INTERNAL
 CFLAGS+= -I${SSL_SRC}
 
+LDADD+= -L${.CURDIR}/../../libcrypto/crypto/obj -lcrypto
+
 SRCS=\
        s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
        s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \

diff --git a/lib/libssl/ssl/shlib_version b/lib/libssl/ssl/shlib_version
index 2e4d25c..b491ec8 100644 (file)
--- a/lib/libssl/ssl/shlib_version
+++ b/lib/libssl/ssl/shlib_version
@@ -1,2 +1,3 @@
+# Don't forget to give libtls the same type of bump!
 major=32
 minor=0

diff --git a/lib/libtls/Makefile b/lib/libtls/Makefile
index 9d88c15..18113df 100644 (file)
--- a/lib/libtls/Makefile
+++ b/lib/libtls/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.8 2015/03/31 14:03:38 jsing Exp $
+#      $OpenBSD: Makefile,v 1.9 2015/05/17 22:39:39 kettenis Exp $
 
 CFLAGS+= -Wall -Werror -Wimplicit
 CFLAGS+= -DLIBRESSL_INTERNAL
@@ -7,6 +7,9 @@ LIB=    tls
 
 DPADD= ${LIBCRYPTO} ${LIBSSL}
 
+LDADD+= -L${.CURDIR}/../../libcrypto/crypto/obj -lcrypto
+LDADD+= -L${.CURDIR}/../../libssl/ssl/obj -lssl
+
 HDRS=  tls.h
 
 SRCS=  tls.c \