summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile2
-rw-r--r--libexec/ftpd/Makefile1
-rw-r--r--libexec/makekey/Makefile2
-rw-r--r--libexec/rexecd/Makefile3
-rw-r--r--usr.bin/lock/Makefile1
-rw-r--r--usr.bin/login/Makefile2
-rw-r--r--usr.bin/passwd/Makefile3
7 files changed, 9 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 00f16d0..b5f3d50 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# XXX MISSING: libmp libplot
-SUBDIR= libc libcompat libcurses libedit libkvm libmd \
+SUBDIR= libc libcompat libcrypt libcurses libedit libkvm libmd \
libresolv librpcsvc libskey libtelnet libterm libutil liby
.if ${MACHINE} == "tahoe"
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 0a067be..22c826f 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -3,6 +3,7 @@
PROG= ftpd
CFLAGS+=-DSETPROCTITLE
SRCS= ftpd.c ftpcmd.c logwtmp.c popen.c
+LDADD= -lcrypt
MAN8= ftpd.8
CLEANFILES+=ftpcmd.c y.tab.h
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index 5f61f4f..dd07112 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -3,9 +3,7 @@
PROG= makekey
MAN8= makekey.8
-.if exists(/usr/lib/libcrypt.a)
DPADD+= ${LIBCRYPT}
LDADD+= -lcrypt
-.endif
.include <bsd.prog.mk>
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index b12d228..0b225ba 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -2,5 +2,8 @@
PROG= rexecd
MAN8= rexecd.8
+LDADD= -lcrypt
+DPADD= ${LIBCRYPT}
+
.include <bsd.prog.mk>
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index 9403206..e08c50d 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -3,5 +3,6 @@
PROG= lock
BINOWN= root
BINMODE=4555
+LDADD= -lcrypt
.include <bsd.prog.mk>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 538bac8..8be09a6 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -6,7 +6,7 @@ SRCS= login.c
#klogin.c
DPADD= ${LIBUTIL}
#${LIBKRB} ${LIBDES}
-LDADD= -lutil
+LDADD= -lutil -lcrypt
#-lkrb -ldes
BINOWN= root
BINMODE=4555
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 4e01954..1614ba4 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -2,13 +2,14 @@
PROG= passwd
SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c
+LDADD= -lcrypt
#krb_passwd.c
#DPADD= ${LIBKRB} ${LIBDES}
.PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
${.CURDIR}/../rlogin
CFLAGS+=-DCRYPT -I${.CURDIR} -I${.CURDIR}/../../usr.sbin/vipw \
-I${.CURDIR}/../../usr.bin/chpass
-#LDADD= -lkrb -ldes
+#LDADD+=-lkrb -ldes
BINOWN= root
BINMODE=4555
INSTALLFLAGS=-fschg
OpenPOWER on IntegriCloud