From: etheisen <etheisen@openbsd.org>
Date: Thu, 15 Feb 1996 05:02:23 +0000 (+0000)
Subject: libcrypt no longer a link dependancy.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=58e54e46d23444d84d361b549e153164c0867f40;p=openbsd

libcrypt no longer a link dependancy.
---

diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index 157d89340da..790c41c5ca0 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.7 1994/12/22 01:16:19 jtc Exp $
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$Id: Makefile,v 1.3 1996/02/15 05:02:23 etheisen Exp $
 
 PROG=	lock
 BINOWN= root
 BINMODE=4555
-LDADD+= -lcrypt
-DPADD+= ${LIBCRYPT}
+#LDADD+= -lcrypt
+#DPADD+= ${LIBCRYPT}
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index e1f6c0243f6..32ebb681727 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,10 +1,13 @@
 #	$NetBSD: Makefile,v 1.10 1994/12/23 06:52:56 jtc Exp $
-#	@(#)Makefile	8.1 (Berkeley) 7/19/93
+#	from: @(#)Makefile	8.1 (Berkeley) 7/19/93
+#	$Id: Makefile,v 1.3 1996/02/15 05:02:24 etheisen Exp $
 
 PROG=	login
 SRCS=	login.c
-LDADD=	-lutil -lcrypt
-DPADD=	${LIBUTIL} ${LIBCRYPT}
+#LDADD=	-lutil -lcrypt
+LDADD=	-lutil
+#DPADD=	${LIBUTIL} ${LIBCRYPT}
+DPADD=	${LIBUTIL}
 
 .include <bsd.own.mk>	# For SKEY, KERBEROS and KERBEROS5
 
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 11dccb7ccef..26507a515a4 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,12 +1,14 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 2/19/91
-#	$Id: Makefile,v 1.4 1996/02/13 07:22:17 dm Exp $
+#	$Id: Makefile,v 1.5 1996/02/15 05:02:25 etheisen Exp $
 
 PROG=	passwd
 SRCS=	local_passwd.c yp_passwd.c passwd.c pw_copy.c pw_util.c getpwent.c
 .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../rlogin ${.CURDIR}/../../lib/libc/gen
-DPADD+= ${LIBRPCSVC} ${LIBCRYPT}
-LDADD+= -lrpcsvc -lcrypt
+#DPADD+= ${LIBRPCSVC} ${LIBCRYPT}
+DPADD+= ${LIBRPCSVC}
+#LDADD+= -lrpcsvc -lcrypt
+LDADD+= -lrpcsvc
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../usr.sbin/vipw -DYP
 
 .if defined(KERBEROS5)
diff --git a/usr.bin/skeyinit/Makefile b/usr.bin/skeyinit/Makefile
index 054940bae89..d0d584a521c 100644
--- a/usr.bin/skeyinit/Makefile
+++ b/usr.bin/skeyinit/Makefile
@@ -1,10 +1,12 @@
-# $Id: Makefile,v 1.1.1.1 1995/10/18 08:46:08 deraadt Exp $
+# $Id: Makefile,v 1.2 1996/02/15 05:02:27 etheisen Exp $
 
 PROG= skeyinit
 BINOWN=root
 BINMODE=4555
 CFLAGS+= -I${.CURDIR}/../../lib/libskey
-DPADD=	${LIBCRYPT} ${LIBSKEY}
-LDADD=	-lcrypt -lskey
+#DPADD=	${LIBCRYPT} ${LIBSKEY}
+DPADD=	${LIBSKEY}
+#LDADD=	-lcrypt -lskey
+LDADD=	-lskey
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index adcb6a2227d..3ac94ce8884 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,11 +1,11 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1995/12/16 22:20:37 tholo Exp $
+#	$Id: Makefile,v 1.3 1996/02/15 05:02:28 etheisen Exp $
 
 PROG=	su
 BINOWN=	root
 BINMODE=4555
-LDADD+= -lcrypt
-DPADD+= ${LIBCRYPT}
+#LDADD+= -lcrypt
+#DPADD+= ${LIBCRYPT}
 
 .include <bsd.own.mk>
 
diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile
index abcbc07124f..0ffaa587fa7 100644
--- a/usr.bin/tn3270/tn3270/Makefile
+++ b/usr.bin/tn3270/tn3270/Makefile
@@ -1,10 +1,12 @@
-#	$Id: Makefile,v 1.2 1995/12/14 03:31:40 deraadt Exp $
+#	$Id: Makefile,v 1.3 1996/02/15 05:02:29 etheisen Exp $
 
 .include "../../Makefile.inc"
 
 CFLAGS += -I${.CURDIR} -I.
-LDADD += -lcurses -ltermcap -ltelnet -lcrypt
-DPADD += ${LIBCURSES} ${LIBTERMCAP} /usr/lib/libtelnet.a ${LIBCRYPT}
+#LDADD += -lcurses -ltermcap -ltelnet -lcrypt
+LDADD += -lcurses -ltermcap -ltelnet
+#DPADD += ${LIBCURSES} ${LIBTERMCAP} /usr/lib/libtelnet.a ${LIBCRYPT}
+DPADD += ${LIBCURSES} ${LIBTERMCAP} /usr/lib/libtelnet.a
 
 SRCS += apilib.c api_bsd.c api_exch.c asc_ebc.c astosc.c dctype.c
 SRCS += disp_asc.c ebc_disp.c