Add libmd (or move it after libcrypt). We don't want the linker to be

smart because it will definitely get it wrong. This popped up during
cross-linking.

7 files changed, 21 insertions, 18 deletions

diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index c17a4ce..7966608 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
+# $FreeBSD$
 
 PROG=	chpass
 CFLAGS+=-Wall
@@ -26,8 +27,8 @@ COPTS+=	-DYP -I. -I${.CURDIR}/../../libexec/ypxfr \
 #Some people need this, uncomment to activate
 #COPTS+= -DRESTRICT_FULLNAME_CHANGE
 
-DPADD=	${LIBRPCSVC} ${LIBCRYPT}
-LDADD+=	-lrpcsvc -lcrypt
+DPADD=	${LIBRPCSVC} ${LIBCRYPT} ${LIBMD}
+LDADD+=	-lrpcsvc -lcrypt -lmd
 
 CLEANFILES= ${GENSRCS}
 
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index a4b697a..42dbdfc 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -1,8 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	lock
 BINMODE=4555
-DPADD=	${LIBCRYPT}
-LDADD=	-lcrypt
+DPADD=	${LIBCRYPT} ${LIBMD}
+LDADD=	-lcrypt -lmd
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 2813ccb..165387e 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -8,8 +8,8 @@ SRCS=	login.c login_access.c login_fbtab.c
 
 CFLAGS+=-Wall -DLOGIN_ACCESS -DLOGALL
 
-DPADD=	${LIBUTIL} ${LIBCRYPT}
-LDADD=	-lutil -lcrypt
+DPADD=	${LIBUTIL} ${LIBCRYPT} ${LIBMD}
+LDADD=	-lutil -lcrypt -lmd
 
 .if defined(NOPAM)
 CFLAGS+= -DNO_PAM
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 953e534..39e3a18 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -12,8 +12,8 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
 	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
 CFLAGS+=-Wall
 
-DPADD=	${LIBCRYPT} ${LIBUTIL}
-LDADD=	-lcrypt -lutil
+DPADD=	${LIBCRYPT} ${LIBUTIL} ${LIBMD}
+LDADD=	-lcrypt -lutil -lmd
 .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../rlogin 
 
@@ -31,8 +31,8 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
 	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
 CFLAGS+=-Wall
 
-DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
-LDADD=	-lcrypt -lrpcsvc -lutil
+DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} ${LIBMD}
+LDADD=	-lcrypt -lrpcsvc -lutil -lmd
 .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
@@ -87,8 +87,9 @@ SRCS+=	kpasswd_standalone.c
 
 CFLAGS+=	-DKERBEROS
 # XXX not defined: ${LIBKADM}, ${LIBCOM_ERR}
-DPADD=	${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL}
-LDADD=	-lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil
+DPADD=	${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} \
+	${LIBUTIL} ${LIBMD}
+LDADD=	-lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil -lmd
 DISTRIBUTION=	krb4
 .endif
 
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 97de1da..6e6439d 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -11,13 +11,13 @@ INSTALLFLAGS=-fschg
 
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBMD}
 CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
 	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err
+LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err -lmd
 DISTRIBUTION=	krb4
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 .endif
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index ede91df..4de4bdf 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -14,8 +14,8 @@ CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
 	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBMD}
+LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err -lmd
 DISTRIBUTION=	krb4
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 .endif
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 91ac2a8..edac507 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -5,8 +5,8 @@ PROG=	su
 SRCS=	su.c
 
 COPTS+=	-DLOGIN_CAP -DSKEY
-DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
-LDADD=	-lutil -lskey -lmd -lcrypt
+DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBCRYPT} ${LIBMD}
+LDADD=	-lutil -lskey -lcrypt -lmd
 
 .if defined(WHEELSU)
 COPTS+=	-DWHEELSU