Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Move linking with libdes to the common kerberos section since



details:   https://anonhg.NetBSD.org/src/rev/5dedb7fc3d2d
branches:  trunk
changeset: 572150:5dedb7fc3d2d
user:      lha <lha%NetBSD.org@localhost>
date:      Wed Dec 22 01:25:05 2004 +0000

description:
Move linking with libdes to the common kerberos section since
libtelnet depends on the old des functions.

>From Jukka Salmi in NetBSD pr misc/28727

diffstat:

 libexec/telnetd/Makefile |  10 +++++-----
 usr.bin/telnet/Makefile  |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (54 lines):

diff -r 1e347fb188d0 -r 5dedb7fc3d2d libexec/telnetd/Makefile
--- a/libexec/telnetd/Makefile  Wed Dec 22 00:54:55 2004 +0000
+++ b/libexec/telnetd/Makefile  Wed Dec 22 01:25:05 2004 +0000
@@ -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 @@
 
 .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
 
diff -r 1e347fb188d0 -r 5dedb7fc3d2d usr.bin/telnet/Makefile
--- a/usr.bin/telnet/Makefile   Wed Dec 22 00:54:55 2004 +0000
+++ b/usr.bin/telnet/Makefile   Wed Dec 22 01:25:05 2004 +0000
@@ -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 @@
 
 .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>



Home | Main Index | Thread Index | Old Index