From d44e2d4226bf9eb5daa8609797680819058bc819 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 18 Dec 1999 13:55:17 +0000 Subject: 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. --- usr.sbin/pw/Makefile | 4 ++-- usr.sbin/rpc.yppasswdd/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile index 02c2957..e6c9fa3 100644 --- a/usr.sbin/pw/Makefile +++ b/usr.sbin/pw/Makefile @@ -10,8 +10,8 @@ MAN8= pw.8 #RND= -DUSE_MD5RAND CFLAGS+= -W -Wall $(CDB) $(RND) -LDADD= -lcrypt -lmd -DPADD= ${LIBCRYPT} ${LIBMD} +LDADD= -lcrypt +DPADD= ${LIBCRYPT} BINMODE=0555 diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index eb63061..772b5fb 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw -I${.CURDIR}/../../usr.sbin/ypserv \ -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.bin/chpass \ -I${.CURDIR} -I. -DPADD= ${LIBRPCSVC} ${LIBCRYPT} ${LIBMD} -LDADD= -lrpcsvc -lcrypt -lmd +DPADD= ${LIBRPCSVC} ${LIBCRYPT} +LDADD= -lrpcsvc -lcrypt CLEANFILES= ${GENSRCS} -- cgit v1.1