Link libcrypto against libcrypt to make sure crypt() is still there -- and

therefore build it earlier in the build process as well.
This commit is contained in:
mycroft 2003-04-03 00:41:50 +00:00
parent 079ee2105d
commit 76126365c9
2 changed files with 7 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.200 2003/02/22 03:20:45 lukem Exp $
# $NetBSD: Makefile,v 1.201 2003/04/03 00:41:50 mycroft Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@ -61,6 +61,7 @@
# includes: installs include files.
# do-lib-csu: builds and installs prerequisites from lib/csu.
# do-lib-libc: builds and installs prerequisites from lib/libc.
# do-lib-libcrypt: builds and installs prerequisites from lib/libcrypt.
# do-lib: builds and installs prerequisites from lib.
# do-gnu-lib: builds and installs prerequisites from gnu/lib.
# do-ld.so: builds and installs prerequisites from libexec/ld.*_so.
@ -161,7 +162,7 @@ BUILDTARGETS+= do-distrib-dirs
.if !defined(NOINCLUDES)
BUILDTARGETS+= includes
.endif
BUILDTARGETS+= do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.so do-build
BUILDTARGETS+= do-lib-csu do-lib-libc do-lib-libcrypt do-lib do-gnu-lib do-ld.so do-build
BUILDTARGETS+= do-obsolete
#
@ -287,7 +288,7 @@ do-${targ}: ${targ}
@true
.endfor
.for dir in tools lib/csu lib/libc lib gnu/lib
.for dir in tools lib/csu lib/libc lib/libcrypt lib gnu/lib
do-${dir:S/\//-/}:
.for targ in dependall install
(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.27 2002/10/07 00:53:31 lukem Exp $
# $NetBSD: Makefile,v 1.28 2003/04/03 00:41:51 mycroft Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@ -26,6 +26,8 @@ WARNS=0
LIB= crypto
CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -I${OPENSSLSRC}
DPADD+= ${LIBCRYPT}
LDADD+= -lcrypt
CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist