[src/trunk]: src rearrange lib stuff so that these link on non-shared-lib pla...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf7e2a403a2b
branches:  trunk
changeset: 556322:cf7e2a403a2b
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Dec 13 22:07:35 2003 +0000

description:
rearrange lib stuff so that these link on non-shared-lib platforms.

diffstat:

 libexec/telnetd/Makefile |  17 ++++++-----------
 usr.bin/kinit/Makefile   |   9 +++------
 usr.bin/telnet/Makefile  |  18 +++++++-----------
 3 files changed, 16 insertions(+), 28 deletions(-)

diffs (105 lines):

diff -r 68e34a4cd186 -r cf7e2a403a2b libexec/telnetd/Makefile
--- a/libexec/telnetd/Makefile  Sat Dec 13 22:06:23 2003 +0000
+++ b/libexec/telnetd/Makefile  Sat Dec 13 22:07:35 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.38 2003/12/11 09:46:27 dyoung Exp $
+#      $NetBSD: Makefile,v 1.39 2003/12/13 22:07:35 chs Exp $
 #      from: @(#)Makefile      8.2 (Berkeley) 12/15/93
 
 .include <bsd.own.mk>
@@ -19,20 +19,15 @@
 LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
 
 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION
-LDADD+= -ldes -lcrypto
-DPADD+=        ${LIBDES} ${LIBCRYPTO}
-
 CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
-CPPFLAGS+=-DKRB5
-
-LDADD+= -lkrb5 -lasn1
-DPADD+=        ${LIBKRB5} ${LIBASN1}
+CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
+LDADD+= -lkrb5 -lasn1 -lcrypto
+DPADD+=        ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 
 .if (${USE_KERBEROS4} != "no")
 CPPFLAGS+=-DKRB4
-LDADD+= -lkrb
-DPADD+=        ${LIBKRB}
+LDADD+= -lkrb -ldes
+DPADD+=        ${LIBKRB} ${LIBDES}
 .endif
 
 VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
diff -r 68e34a4cd186 -r cf7e2a403a2b usr.bin/kinit/Makefile
--- a/usr.bin/kinit/Makefile    Sat Dec 13 22:06:23 2003 +0000
+++ b/usr.bin/kinit/Makefile    Sat Dec 13 22:07:35 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/12/11 09:46:27 dyoung Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/13 22:07:35 chs Exp $
 
 NOLINT= # defined
 
@@ -13,14 +13,11 @@
 
 SRCS= kinit.c
 
-foo:
-       echo ${MKKERBEROS4}
-
 .if ${MKKERBEROS4} != "no"
 CPPFLAGS+= -DKRB4
 CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
-KRB4LDADD= -lkrb
-KRB4DPADD= ${LIBKRB}
+KRB4LDADD= -lkrb -ldes
+KRB4DPADD= ${LIBKRB} ${LIBDES}
 .endif
 
 CPPFLAGS+= -I.                                 \
diff -r 68e34a4cd186 -r cf7e2a403a2b usr.bin/telnet/Makefile
--- a/usr.bin/telnet/Makefile   Sat Dec 13 22:06:23 2003 +0000
+++ b/usr.bin/telnet/Makefile   Sat Dec 13 22:07:35 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.32 2003/12/11 09:46:27 dyoung Exp $
+#      $NetBSD: Makefile,v 1.33 2003/12/13 22:07:35 chs Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -48,28 +48,24 @@
        terminal.c tn3270.c utilities.c
 
 CPPFLAGS+=-I${NETBSDSRCDIR}/lib
-
 CPPFLAGS+=-DIPSEC
 LDADD+=        -lipsec
 DPADD+=        ${LIBIPSEC}
+
 CPPFLAGS+=-DINET6
 
 LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
 
 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION
-LDADD+= -ldes -lcrypto
-DPADD+=        ${LIBDES} ${LIBCRYPTO}
-
 CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
-CPPFLAGS+=-DKRB5 -DFORWARD
-LDADD+= -lkrb5 -lasn1
-DPADD+=        ${LIBKRB5} ${LIBASN1}
+CPPFLAGS+=-DKRB5 -DFORWARD -DAUTHENTICATION -DENCRYPTION
+LDADD+= -lkrb5 -lasn1 -lcrypto
+DPADD+=        ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 
 .if (${USE_KERBEROS4} != "no")
 CPPFLAGS+= -DKRB4
-LDADD+= -lkrb
-DPADD+=        ${LIBKRB}
+LDADD+= -lkrb -ldes
+DPADD+=        ${LIBKRB} ${LIBDES}
 .endif
 
 LDADD+= -lcom_err -lroken