Stop enforcing dependencies between MK_* options at Makefile level.
All the dependencies are satisfied now in <bsd.own.mk>.
This commit is contained in:
parent
33f0bffeb7
commit
594a130b8a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=160854
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user