From ec2fce6561acc24cb60670f6f4601e0c29f5f3fa Mon Sep 17 00:00:00 2001
From: kris <kris@FreeBSD.org>
Date: Thu, 13 Apr 2000 07:37:35 +0000
Subject: Update for OpenSSL 0.9.5a and clean up a bit.

---
 secure/lib/libssl/Makefile | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

(limited to 'secure/lib/libssl')

diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 4e649c0..e8d4ba5 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -2,28 +2,24 @@
 
 .include "../libcrypto/Makefile.inc"
 
-LOPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/ssl
+LCRYPTOSSL_SRC=${LCRYPTO_SRC}/../ssl
 
-.PATH:	${LOPENSSL_SRC}
+.PATH:	${LCRYPTOSSL_SRC}
 
 LIB=		ssl
 SHLIB_MAJOR=	1
 
 MAINTAINER=	kris
 
-SRCS=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
+SRCS+=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
 	s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c s3_both.c \
 	s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c s3_srvr.c ssl_algs.c \
 	ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c ssl_err2.c ssl_lib.c \
 	ssl_rsa.c ssl_sess.c ssl_stat.c ssl_txt.c t1_clnt.c t1_enc.c \
-	t1_lib.c t1_meth.c t1_srvr.c 
+	t1_lib.c t1_meth.c t1_srvr.c
 
 HDRS=	ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
 
-.for h in ${HDRS}
-BUILD_HDRS_OPENSSL+= ${LOPENSSL_SRC}/${h}
-.endfor
-
 CRYPTOHDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
 	buffer/buffer.h cast/cast.h comp/comp.h conf/conf.h crypto.h \
 	des/des.h dh/dh.h dsa/dsa.h ../e_os.h ../e_os2.h ebcdic.h \
@@ -34,29 +30,17 @@ CRYPTOHDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
 	sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h x509/x509.h \
 	x509/x509_vfy.h x509v3/x509v3.h
 
-.for h in ${CRYPTOHDRS}
-BUILD_HDRS_CRYPTO+= ${LCRYPTO_SRC}/${h}
+.for h in ${HDRS}
+CRYPTO_HDRS+= ${LCRYPTOSSL_SRC}/${h}
 .endfor
 
-#	this bogus header was the easiest way to get the openssl/
-#	directory populated
-SRCS+=		openssl/headers-copied.h
-CLEANDIRS+=	openssl
-
-openssl/opensslconf.h: ${.CURDIR}/../libcrypto/opensslconf-${MACHINE_ARCH}.h
-	@test -d openssl || mkdir -p openssl
-	cp ${.OODATE} ${.TARGET}
-
-openssl/headers-copied.h:  openssl/opensslconf.h
-	@test -d openssl || mkdir -p openssl
-	${INSTALL} ${COPY} -m 444 \
-	    ${BUILD_HDRS_OPENSSL} ${BUILD_HDRS_CRYPTO} \
-	    openssl
-	@touch ${.TARGET}
+.for h in ${CRYPTOHDRS}
+EXTRA_HDRS+= ${LCRYPTO_SRC}/${h}
+.endfor
 
-beforeinstall:
+beforeinstall:  openssl/opensslconf.h
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${BUILD_HDRS_OPENSSL} \
+	    ${CRYPTO_HDRS} openssl/opensslconf.h \
 	    ${DESTDIR}/usr/include/openssl
 
 .include <bsd.lib.mk>
-- 
cgit v1.1