Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move linking with libdes to the common kerberos section since

Browse Source 
libtelnet depends on the old des functions.

From Jukka Salmi in NetBSD pr misc/28727
This commit is contained in:
lha 2004-12-22 01:25:05 +00:00
parent cca3038b40
commit a0dab7aa39
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libexec/telnetd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.39 2003/12/13 22:07:35 chs Exp $
# $NetBSD: Makefile,v 1.40 2004/12/22 01:25:05 lha Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
.include <bsd.own.mk>
@ -26,14 +26,14 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
.if (${USE_KERBEROS4} != "no")
CPPFLAGS+=-DKRB4
LDADD+= -lkrb -ldes
DPADD+= ${LIBKRB} ${LIBDES}
LDADD+= -lkrb
DPADD+= ${LIBKRB}
.endif
VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
LDADD+= -lcom_err -L${VERS} -lvers -lroken
DPADD+= ${LIBCOM_ERR} ${LIBROKEN}
LDADD+= -ldes -lcom_err -L${VERS} -lvers -lroken
DPADD+= ${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}
.endif

10
usr.bin/telnet/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.33 2003/12/13 22:07:35 chs Exp $
# $NetBSD: Makefile,v 1.34 2004/12/22 01:25:05 lha Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@ -64,12 +64,12 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
.if (${USE_KERBEROS4} != "no")
CPPFLAGS+= -DKRB4
LDADD+= -lkrb -ldes
DPADD+= ${LIBKRB} ${LIBDES}
LDADD+= -lkrb
DPADD+= ${LIBKRB}
.endif
LDADD+= -lcom_err -lroken
DPADD+= ${LIBCOM_ERR} ${LIBROKEN}
LDADD+= -ldes -lcom_err -lroken
DPADD+= ${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}
.endif
.include <bsd.prog.mk>