* Fix dependancies so that ``make depend'' is not required.

* Some style fixes

Approved by:	kris

1 files changed, 26 insertions, 24 deletions

diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 5b9cde7..4e649c0 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -2,13 +2,15 @@
 
 .include "../libcrypto/Makefile.inc"
 
+LOPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/ssl
+
+.PATH:	${LOPENSSL_SRC}
+
 LIB=		ssl
 SHLIB_MAJOR=	1
 
 MAINTAINER=	kris
 
-LOPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/ssl
-
 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 \
@@ -18,6 +20,10 @@ SRCS=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_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 \
@@ -28,33 +34,29 @@ 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
 
-beforedepend:	headers ${.OBJDIR}/openssl/opensslconf.h
-
-DPADD+=	${.OBJDIR}/openssl/opensslconf.h
+.for h in ${CRYPTOHDRS}
+BUILD_HDRS_CRYPTO+= ${LCRYPTO_SRC}/${h}
+.endfor
 
-CLEANDIRS+=	${.OBJDIR}/openssl
+#	this bogus header was the easiest way to get the openssl/
+#	directory populated
+SRCS+=		openssl/headers-copied.h
+CLEANDIRS+=	openssl
 
-${.OBJDIR}/openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
-	@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
+openssl/opensslconf.h: ${.CURDIR}/../libcrypto/opensslconf-${MACHINE_ARCH}.h
+	@test -d openssl || mkdir -p openssl
 	cp ${.OODATE} ${.TARGET}
 
-headers:
-	@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
-	for i in ${HDRS}; do \
-		${INSTALL} ${COPY} -m 444 ${LOPENSSL_SRC}/$$i \
-			${.OBJDIR}/openssl; \
-	done; \
-	for i in ${CRYPTOHDRS}; do \
-		${INSTALL} ${COPY} -m 444 ${LCRYPTO_SRC}/$$i \
-			${.OBJDIR}/openssl; \
-	done
+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}
 
 beforeinstall:
-	for i in ${HDRS}; do \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-			${LOPENSSL_SRC}/$$i ${DESTDIR}/usr/include/openssl; \
-	done
-
-.PATH:	${LOPENSSL_SRC}
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${BUILD_HDRS_OPENSSL} \
+	    ${DESTDIR}/usr/include/openssl
 
 .include <bsd.lib.mk>