diff options
| author | peter <peter@FreeBSD.org> | 1999-12-18 13:55:17 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-12-18 13:55:17 +0000 |
| commit | d44e2d4226bf9eb5daa8609797680819058bc819 (patch) | |
| tree | 3c5d814d56c288c5276b1f6789a14ff54ca8b34c /usr.bin/passwd | |
| parent | 2c47e5f1e90cf19509244c9de6d167bf7642601a (diff) | |
| download | FreeBSD-src-d44e2d4226bf9eb5daa8609797680819058bc819.zip FreeBSD-src-d44e2d4226bf9eb5daa8609797680819058bc819.tar.gz | |
Revert the libcrypt/libmd stuff back to how it was. This should not have
happened as it was working around problems elsewhere (ie: binutils/ld
not doing the right thing according to the ELF design). libcrypt has
been adjusted to not need the runtime -lmd. It's still not quite right
(ld is supposed to work damnit) but at least it doesn't impact all the
users of libcrypt in Marcel's cross-build model.
Diffstat (limited to 'usr.bin/passwd')
| -rw-r--r-- | usr.bin/passwd/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 39e3a18..953e534 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} ${LIBMD} -LDADD= -lcrypt -lutil -lmd +DPADD= ${LIBCRYPT} ${LIBUTIL} +LDADD= -lcrypt -lutil .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} ${LIBMD} -LDADD= -lcrypt -lrpcsvc -lutil -lmd +DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} +LDADD= -lcrypt -lrpcsvc -lutil .PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \ ${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \ ${.CURDIR}/../../usr.sbin/rpc.yppasswdd @@ -87,9 +87,8 @@ SRCS+= kpasswd_standalone.c CFLAGS+= -DKERBEROS # XXX not defined: ${LIBKADM}, ${LIBCOM_ERR} -DPADD= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} \ - ${LIBUTIL} ${LIBMD} -LDADD= -lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil -lmd +DPADD= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL} +LDADD= -lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil DISTRIBUTION= krb4 .endif |
