[src/trunk]: src/lib/libcrypto Make at least the ELF version work. crypt was ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eca4ca8ede8c
branches:  trunk
changeset: 574489:eca4ca8ede8c
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 02 01:04:21 2005 +0000

description:
Make at least the ELF version work. crypt was broken because it was
compiled against the wrong headers. Now we just depend on libcrypt.

diffstat:

 lib/libcrypto/Makefile |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r 40341c943c2a -r eca4ca8ede8c lib/libcrypto/Makefile
--- a/lib/libcrypto/Makefile    Tue Mar 01 18:08:42 2005 +0000
+++ b/lib/libcrypto/Makefile    Wed Mar 02 01:04:21 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.36 2004/07/02 00:05:23 sjg Exp $
+#      $NetBSD: Makefile,v 1.37 2005/03/02 01:04:21 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -35,16 +35,20 @@
 
 .include "srcs.inc"
 
+LIBDPLIBS= crypt ${.CURDIR}/../libcrypt
+
+
+# XXX
+.if ${OBJECT_FMT} == "ELF"
+AFLAGS+=-DELF
+LIBDPLIBS= crypt ${.CURDIR}/../libcrypt
+.else
+AFLAGS+=-DOUT
+# XXX: This is broken because we compile with the wrong des headers.
 # NetBSD's crypt(3) library, in lieu of the one included with OpenSSL,
 # since NetBSD's also supports MD5, SHA1 and Blowfish passwords.
 .PATH: ${NETBSDSRCDIR}/lib/libcrypt
 SRCS+= crypt.c md5crypt.c bcrypt.c crypt-sha1.c util.c
-
-# XXX
-.if ${OBJECT_FMT} == "ELF"
-AFLAGS+=-DELF
-.else
-AFLAGS+=-DOUT
 .endif
 
 OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh