From b0081f6365e438f9d18dba1905ca9989451bb14d Mon Sep 17 00:00:00 2001 From: Peter Wemm 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. --- chpass/Makefile | 4 ++-- pw/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chpass/Makefile b/chpass/Makefile index 7966608..6e26143 100644 --- a/chpass/Makefile +++ b/chpass/Makefile @@ -27,8 +27,8 @@ COPTS+= -DYP -I. -I${.CURDIR}/../../libexec/ypxfr \ #Some people need this, uncomment to activate #COPTS+= -DRESTRICT_FULLNAME_CHANGE -DPADD= ${LIBRPCSVC} ${LIBCRYPT} ${LIBMD} -LDADD+= -lrpcsvc -lcrypt -lmd +DPADD= ${LIBRPCSVC} ${LIBCRYPT} +LDADD+= -lrpcsvc -lcrypt CLEANFILES= ${GENSRCS} diff --git a/pw/Makefile b/pw/Makefile index 02c2957..e6c9fa3 100644 --- a/pw/Makefile +++ b/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 -- cgit v1.2.3-56-ge451