From 594a130b8afb2e64c0b0d285ecf11b33cb1cfad8 Mon Sep 17 00:00:00 2001 From: Yaroslav Tykhiy Date: Mon, 31 Jul 2006 13:29:36 +0000 Subject: [PATCH] Stop enforcing dependencies between MK_* options at Makefile level. All the dependencies are satisfied now in . --- lib/libtelnet/Makefile | 3 ++- libexec/telnetd/Makefile | 3 ++- usr.bin/telnet/Makefile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index eda86aa6786f..37eb8f6da801 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -19,13 +19,14 @@ WARNS?= 0 .if ${MK_OPENSSL} != "no" SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" SRCS+= kerberos5.c CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif .endif -.endif INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index f60bf5a1aab0..151917080553 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -35,11 +35,12 @@ SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM} +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} LDADD+= -lkrb5 -lasn1 -lroken -lcom_err .endif -.endif .include diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index c688c5231ace..c5525b3c20d1 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -38,12 +38,13 @@ SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} LDADD+= -lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM} +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} LDADD+= -lkrb5 -lasn1 -lcom_err -lroken .endif .endif -.endif .include