summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--eBones/lib/libtelnet/Makefile27
-rw-r--r--secure/lib/libtelnet/Makefile27
2 files changed, 14 insertions, 40 deletions
diff --git a/eBones/lib/libtelnet/Makefile b/eBones/lib/libtelnet/Makefile
index 631cd8a..d8df7be 100644
--- a/eBones/lib/libtelnet/Makefile
+++ b/eBones/lib/libtelnet/Makefile
@@ -1,43 +1,30 @@
# From: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $Id: Makefile,v 1.12 1996/03/09 13:36:34 ache Exp $
+# $Id$
LIB= telnet
SRCS= encrypt.c genget.c getent.c misc.c
CFLAGS+= -DHAS_CGETENT
-#ifdef ENCRYPTION
+.if defined(MAKE_EBONES)
CFLAGS+= -DENCRYPTION
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
- || defined(MAKE_KERBEROS))
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES)
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
# KRB4_ENCPWD not yet defined
-#CFLAGS+= -DKRB4_ENCPWD
SRCS+= auth.c kerberos.c enc_des.c
-# KRB4_ENCPWD not yet defined
-#SRCS+= krb4encpwd.c read_password.c
LDADD+= -ldes -lkrb
DPADD+= ${LIBDES} ${LIBKRB}
.endif
-#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
-# || defined(MAKE_KERBEROS))
-#CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
-#CFLAGS+= -DKRB5 -DFORWARD
-#SRCS+= auth.c kerberos5.c forward.c enc_des.c
-#LDADD+= -ldes -lkrb5
-#DPADD+= ${LIBDES}
-#.endif
-
# Not Yet
#SRCS += spx.c rsaencpwd.c read_password.c
# Used only in krb4encpwd.c and rsaencpwd.c, not yet active
#LDADD+= -ldescrypt
-#endif /* ENCRYPTION */
+.endif /* ENCRYPTION */
# These are the sources that have encryption stuff in them.
CRYPT_SRC= auth.c enc-proto.h enc_des.c encrypt.c
@@ -48,7 +35,7 @@ NOCRYPT_DIR=${.CURDIR}/Nocrypt
.include <bsd.lib.mk>
nocrypt:
-#ifdef ENCRYPTION
+.if defined(ENCRYPTION)
@for i in ${CRYPT_SRC}; do \
if [ ! -d ${NOCRYPT_DIR} ]; then \
echo Creating subdirectory ${NOCRYPT_DIR}; \
@@ -60,6 +47,6 @@ nocrypt:
done
placeholder:
-#else /* ENCRYPTION */
+.else
@echo "Encryption code already removed."
-#endif /* ENCRYPTION */
+.endif
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index 631cd8a..d8df7be 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -1,43 +1,30 @@
# From: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $Id: Makefile,v 1.12 1996/03/09 13:36:34 ache Exp $
+# $Id$
LIB= telnet
SRCS= encrypt.c genget.c getent.c misc.c
CFLAGS+= -DHAS_CGETENT
-#ifdef ENCRYPTION
+.if defined(MAKE_EBONES)
CFLAGS+= -DENCRYPTION
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
- || defined(MAKE_KERBEROS))
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES)
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
# KRB4_ENCPWD not yet defined
-#CFLAGS+= -DKRB4_ENCPWD
SRCS+= auth.c kerberos.c enc_des.c
-# KRB4_ENCPWD not yet defined
-#SRCS+= krb4encpwd.c read_password.c
LDADD+= -ldes -lkrb
DPADD+= ${LIBDES} ${LIBKRB}
.endif
-#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
-# || defined(MAKE_KERBEROS))
-#CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
-#CFLAGS+= -DKRB5 -DFORWARD
-#SRCS+= auth.c kerberos5.c forward.c enc_des.c
-#LDADD+= -ldes -lkrb5
-#DPADD+= ${LIBDES}
-#.endif
-
# Not Yet
#SRCS += spx.c rsaencpwd.c read_password.c
# Used only in krb4encpwd.c and rsaencpwd.c, not yet active
#LDADD+= -ldescrypt
-#endif /* ENCRYPTION */
+.endif /* ENCRYPTION */
# These are the sources that have encryption stuff in them.
CRYPT_SRC= auth.c enc-proto.h enc_des.c encrypt.c
@@ -48,7 +35,7 @@ NOCRYPT_DIR=${.CURDIR}/Nocrypt
.include <bsd.lib.mk>
nocrypt:
-#ifdef ENCRYPTION
+.if defined(ENCRYPTION)
@for i in ${CRYPT_SRC}; do \
if [ ! -d ${NOCRYPT_DIR} ]; then \
echo Creating subdirectory ${NOCRYPT_DIR}; \
@@ -60,6 +47,6 @@ nocrypt:
done
placeholder:
-#else /* ENCRYPTION */
+.else
@echo "Encryption code already removed."
-#endif /* ENCRYPTION */
+.endif
OpenPOWER on IntegriCloud