diff options
author | yar <yar@FreeBSD.org> | 2006-07-31 13:29:36 +0000 |
---|---|---|
committer | yar <yar@FreeBSD.org> | 2006-07-31 13:29:36 +0000 |
commit | fe55b573c001c66187da635932a9d849f4dd2616 (patch) | |
tree | a7f76bec876094eb0068c0b7890246e6f2f2c3fb | |
parent | 09bab3681df99ea60451587430c27cebf93d07d3 (diff) | |
download | FreeBSD-src-fe55b573c001c66187da635932a9d849f4dd2616.zip FreeBSD-src-fe55b573c001c66187da635932a9d849f4dd2616.tar.gz |
Stop enforcing dependencies between MK_* options at Makefile level.
All the dependencies are satisfied now in <bsd.own.mk>.
-rw-r--r-- | lib/libtelnet/Makefile | 3 | ||||
-rw-r--r-- | libexec/telnetd/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/telnet/Makefile | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index eda86aa..37eb8f6 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 f60bf5a..1519170 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 <bsd.prog.mk> diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index c688c52..c5525b3 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 <bsd.prog.mk> |