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

* Some style fixes

Approved by:	kris

1 files changed, 39 insertions, 38 deletions

diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 589eeb7..928e2ce 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -2,6 +2,19 @@
 
 .include "Makefile.inc"
 
+.PATH:  ${LCRYPTO_SRC} ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/bf \
+	${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/buffer \
+	${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/conf \
+	${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/dsa \
+	${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/hmac \
+	${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 \
+	${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem \
+	${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand \
+	${LCRYPTO_SRC}/rc2 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 \
+	${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/../rsaref \
+	${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db \
+	${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3
+
 LIB=		crypto
 SHLIB_MAJOR=	1
 
@@ -159,6 +172,10 @@ HDRS=	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 ${HDRS}
+CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h}
+.endfor
+
 MAN3=	des_crypt.3
 
 MLINKS= des_crypt.3 des_read_password.3 \
@@ -173,56 +190,40 @@ MLINKS= des_crypt.3 des_read_password.3 \
 	des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \
 	des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3
 
-beforedepend: ${.OBJDIR}/obj_dat.h ${.OBJDIR}/buildinf.h \
-	${.OBJDIR}/openssl/opensslconf.h headers
-
-DPADD+=	${.OBJDIR}/obj_dat.h ${.OBJDIR}/buildinf.h ${.OBJDIR}/openssl/opensslconf.h
+GENHDRS+=	obj_dat.h buildinf.h
+SRCS+=		${GENHDRS}
+CLEANFILES+=	${GENHDRS}
+CLEANDIRS+=	openssl
 
-CLEANFILES+=	${.OBJDIR}/obj_dat.h ${.OBJDIR}/buildinf.h
-CLEANDIRS+=	${.OBJDIR}/openssl
+#	this bogus dependacy was the easiest way to get the openssl/ 
+#	directory populated
+${GENHDRS}: openssl/opensslconf.h openssl/headers-copied
 
-${.OBJDIR}/obj_dat.h:	${LCRYPTO_SRC}/objects/obj_dat.pl
-	perl ${LCRYPTO_SRC}/objects/obj_dat.pl < ${LCRYPTO_SRC}/objects/objects.h > ${.OBJDIR}/obj_dat.h
+obj_dat.h:  ${LCRYPTO_SRC}/objects/obj_dat.pl
+	perl ${LCRYPTO_SRC}/objects/obj_dat.pl \
+	    < ${LCRYPTO_SRC}/objects/objects.h > ${.TARGET}
 
-${.OBJDIR}/buildinf.h:
+buildinf.h:
 	( echo "#ifndef MK1MF_BUILD"; \
 	echo "  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
 	echo "  #define CFLAGS \"$(CC)\""; \
 	echo "  #define PLATFORM \"`uname -s`-`uname -m`\""; \
 	echo "  #define DATE \"`date`\""; \
-	echo "#endif" ) > ${.OBJDIR}/buildinf.h
+	echo "#endif" ) > ${.TARGET}
 
-${.OBJDIR}/openssl/opensslconf.h: opensslconf-${MACHINE_ARCH}.h
-	@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
+openssl/opensslconf.h:  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 ${LCRYPTO_SRC}/$$i \
-			${.OBJDIR}/openssl; \
-	done
-
-beforeinstall: ${.OBJDIR}/openssl/opensslconf.h
-	for i in ${HDRS}; do \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-			${LCRYPTO_SRC}/$$i ${DESTDIR}/usr/include/openssl; \
-	done; \
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${.OBJDIR}/openssl/opensslconf.h ${DESTDIR}/usr/include/openssl
+openssl/headers-copied:
+	@test -d openssl || mkdir -p openssl
+	${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} openssl
+	@touch ${.TARGET}
 
-.PATH:	${LCRYPTO_SRC} ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/bf \
-	${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/buffer \
-	${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/conf \
-	${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/dsa \
-	${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/hmac \
-	${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 \
-	${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem \
-	${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand \
-	${LCRYPTO_SRC}/rc2 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 \
-	${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/../rsaref \
-	${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db \
-	${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3
+beforeinstall:  openssl/opensslconf.h
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${CRYPTO_HDRS} openssl/opensslconf.h \
+	    ${DESTDIR}/usr/include/openssl
 
 .include <bsd.lib.mk>