From 4e18f26dcd1f552d5bb621113cfb229d4d789e9a Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Sun, 17 May 2015 22:39:39 +0000
Subject: [PATCH] Record inter-library dependencies between libcrypto, libssl
 and libtls

---
 lib/libcrypto/crypto/shlib_version | 1 +
 lib/libcrypto/shlib_version        | 1 +
 lib/libssl/shlib_version           | 1 +
 lib/libssl/ssl/Makefile            | 4 +++-
 lib/libssl/ssl/shlib_version       | 1 +
 lib/libtls/Makefile                | 5 ++++-
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/libcrypto/crypto/shlib_version b/lib/libcrypto/crypto/shlib_version
index ed8f7473b52..ae052231bf4 100644
--- 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 ed8f7473b52..ae052231bf4 100644
--- 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 2e4d25cdf59..b491ec8a3da 100644
--- 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 3dbd4768585..5a17ff20109 100644
--- 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 2e4d25cdf59..b491ec8a3da 100644
--- 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 9d88c15923a..18113df999c 100644
--- 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 \
-- 
2.20.1