diff options
author | ache <ache@FreeBSD.org> | 1996-03-09 13:26:21 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1996-03-09 13:26:21 +0000 |
commit | beb2bbfb7ab03630a9b297e2ca927db8068a590f (patch) | |
tree | 9e1df733e948507dceaf6c3de57dcbb3ad9118de | |
parent | f785271ddafea2eb75061d9de1d5b5bac3f48fb2 (diff) | |
download | FreeBSD-src-beb2bbfb7ab03630a9b297e2ca927db8068a590f.zip FreeBSD-src-beb2bbfb7ab03630a9b297e2ca927db8068a590f.tar.gz |
Sense MAKE_EBONES, DESTDIR
SRCS cleanup
DPADD cleanup
-rw-r--r-- | eBones/usr.bin/telnet/Makefile | 20 | ||||
-rw-r--r-- | secure/usr.bin/telnet/Makefile | 20 |
2 files changed, 26 insertions, 14 deletions
diff --git a/eBones/usr.bin/telnet/Makefile b/eBones/usr.bin/telnet/Makefile index 5314ad7..d751687 100644 --- a/eBones/usr.bin/telnet/Makefile +++ b/eBones/usr.bin/telnet/Makefile @@ -43,24 +43,30 @@ DPADD+= ${TELNETOBJDIR}/libtelnet.a #ifdef ENCRYPTION -CFLAGS+=-DAUTHENTICATION -DENCRYPTION +CFLAGS += -DENCRYPTION -.if exists(/usr/lib/libkrb.a) +.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \ + || defined(MAKE_KERBEROS)) +CFLAGS+=-DAUTHENTICATION CFLAGS+= -DKRB4 LDADD+= -ldes -lkrb +DPADD+= ${LIBDES} ${LIBKRB} .endif -.if exists(/usr/lib/libkrb5.a) -CFLAGS+= -DKRB5 -DFORWARD -LDADD+= -ldes -lkrb5 -.endif +#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \ +# || defined(MAKE_KERBEROS)) +#CFLAGS+=-DAUTHENTICATION +#CFLAGS+= -DKRB5 -DFORWARD +#LDADD+= -ldes -lkrb5 +#DPADD+= ${LIBDES} +#.endif # Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active #LDADD+= -ldescrypt #endif /* ENCRYPTION */ -DPADD= ${LIBTERMCAP} +DPADD+= ${LIBTERMCAP} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ terminal.c tn3270.c utilities.c diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index 5314ad7..d751687 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -43,24 +43,30 @@ DPADD+= ${TELNETOBJDIR}/libtelnet.a #ifdef ENCRYPTION -CFLAGS+=-DAUTHENTICATION -DENCRYPTION +CFLAGS += -DENCRYPTION -.if exists(/usr/lib/libkrb.a) +.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \ + || defined(MAKE_KERBEROS)) +CFLAGS+=-DAUTHENTICATION CFLAGS+= -DKRB4 LDADD+= -ldes -lkrb +DPADD+= ${LIBDES} ${LIBKRB} .endif -.if exists(/usr/lib/libkrb5.a) -CFLAGS+= -DKRB5 -DFORWARD -LDADD+= -ldes -lkrb5 -.endif +#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \ +# || defined(MAKE_KERBEROS)) +#CFLAGS+=-DAUTHENTICATION +#CFLAGS+= -DKRB5 -DFORWARD +#LDADD+= -ldes -lkrb5 +#DPADD+= ${LIBDES} +#.endif # Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active #LDADD+= -ldescrypt #endif /* ENCRYPTION */ -DPADD= ${LIBTERMCAP} +DPADD+= ${LIBTERMCAP} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ terminal.c tn3270.c utilities.c |