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.
This commit is contained in:
marcel 1999-12-16 10:55:45 +00:00
parent 0bfd2ea9bc
commit 3239491159
12 changed files with 32 additions and 28 deletions

View File

@ -7,8 +7,9 @@ NOMAN= true
CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DIAMSUID
SRCS= perlmain.c sperl.c config.h
NOSHARED= no
DPADD= lib/auto/DynaLoader/DynaLoader.a ${LIBPERL} ${LIBM} ${LIBCRYPT}
LDADD= lib/auto/DynaLoader/DynaLoader.a -lperl -lm -lcrypt
DYNALOADER= lib/auto/DynaLoader/DynaLoader.a
DPADD= ${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD}
LDADD= ${DYNALOADER} -lperl -lm -lcrypt -lmd
BINOWN= root
BINMODE=4511
LINKS= ${BINDIR}/${PROG} ${BINDIR}/sperl5.00503

View File

@ -4,7 +4,7 @@
PROG= makekey
MAN8= makekey.8
DPADD+= ${LIBCRYPT}
LDADD+= -lcrypt
DPADD+= ${LIBCRYPT} ${LIBMD}
LDADD+= -lcrypt -lmd
.include <bsd.prog.mk>

View File

@ -3,6 +3,6 @@
PROG= uucpd
MAN8= uucpd.8
LDADD= -lcrypt -lutil
DPADD= ${LIBCRYPT} ${LIBUTIL}
LDADD= -lcrypt -lutil -lmd
DPADD= ${LIBCRYPT} ${LIBUTIL} ${LIBMD}
.include <bsd.prog.mk>

View File

@ -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}

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -10,8 +10,8 @@ MAN8= pw.8
#RND= -DUSE_MD5RAND
CFLAGS+= -W -Wall $(CDB) $(RND)
LDADD= -lcrypt
DPADD= ${LIBCRYPT}
LDADD= -lcrypt -lmd
DPADD= ${LIBCRYPT} ${LIBMD}
BINMODE=0555

View File

@ -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}
LDADD= -lrpcsvc -lcrypt
DPADD= ${LIBRPCSVC} ${LIBCRYPT} ${LIBMD}
LDADD= -lrpcsvc -lcrypt -lmd
CLEANFILES= ${GENSRCS}