From 135587ee9741d70e874e48d6ba3467827d2bfc90 Mon Sep 17 00:00:00 2001 From: markm Date: Mon, 11 Mar 1996 16:17:58 +0000 Subject: [PATCH] Big clean-up job. Remove ancient and never-to-be used stuff. The look much more like BSD Makefiles now. --- eBones/lib/libtelnet/Makefile | 35 ++------------------- eBones/libexec/telnetd/Makefile | 43 +++---------------------- eBones/usr.bin/telnet/Makefile | 56 +++++---------------------------- secure/lib/libtelnet/Makefile | 35 ++------------------- secure/libexec/telnetd/Makefile | 43 +++---------------------- secure/usr.bin/telnet/Makefile | 56 +++++---------------------------- 6 files changed, 30 insertions(+), 238 deletions(-) diff --git a/eBones/lib/libtelnet/Makefile b/eBones/lib/libtelnet/Makefile index d8df7be81ef3..94f75499080e 100644 --- a/eBones/lib/libtelnet/Makefile +++ b/eBones/lib/libtelnet/Makefile @@ -3,16 +3,11 @@ LIB= telnet SRCS= encrypt.c genget.c getent.c misc.c -CFLAGS+= -DHAS_CGETENT -.if defined(MAKE_EBONES) - -CFLAGS+= -DENCRYPTION +CFLAGS+= -DHAS_CGETENT -DENCRYPTION .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+= -DDES_ENCRYPTION -DAUTHENTICATION -DKRB4 -I/usr/include/kerberosIV SRCS+= auth.c kerberos.c enc_des.c LDADD+= -ldes -lkrb DPADD+= ${LIBDES} ${LIBKRB} @@ -21,32 +16,8 @@ DPADD+= ${LIBDES} ${LIBKRB} # Not Yet #SRCS += spx.c rsaencpwd.c read_password.c +# KRB4_ENCPWD not yet defined # Used only in krb4encpwd.c and rsaencpwd.c, not yet active #LDADD+= -ldescrypt -.endif /* ENCRYPTION */ - -# These are the sources that have encryption stuff in them. -CRYPT_SRC= auth.c enc-proto.h enc_des.c encrypt.c -CRYPT_SRC+= encrypt.h kerberos.c kerberos5.c krb4encpwd.c -CRYPT_SRC+= misc.c spx.c Makefile -NOCRYPT_DIR=${.CURDIR}/Nocrypt - .include - -nocrypt: -.if defined(ENCRYPTION) - @for i in ${CRYPT_SRC}; do \ - if [ ! -d ${NOCRYPT_DIR} ]; then \ - echo Creating subdirectory ${NOCRYPT_DIR}; \ - mkdir ${NOCRYPT_DIR}; \ - fi; \ - echo ${NOCRYPT_DIR}/$$i; \ - unifdef -UENCRYPTION ${.CURDIR}/$$i | \ - sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \ - done - -placeholder: -.else - @echo "Encryption code already removed." -.endif diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile index 002dc3fe6f43..c0c82eef6791 100644 --- a/eBones/libexec/telnetd/Makefile +++ b/eBones/libexec/telnetd/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/15/93 +# $Id$ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -12,52 +13,16 @@ SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ DPADD= ${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP} LDADD= -L${TELNETOBJDIR} -lutil -ltermcap -ltelnet -CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK -CFLAGS+=-I${.CURDIR}/../../lib +CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK +CFLAGS+= -DENCRYPTION -I${.CURDIR}/../../lib -#ifdef ENCRYPTION - -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+=-DAUTHENTICATION LDADD+= -ldes -lkrb DPADD+= ${LIBDES} ${LIBKRB} .endif -#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \ -# || defined(MAKE_KERBEROS)) -#CFLAGS+=-DAUTHENTICATION -#LDADD+= -ldes -lkrb5 -#DPADD+= ${LIBDES} -#.endif - # Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active #LDADD+= -ldescrypt -#endif /* ENCRYPTION */ - -# These are the sources that have encryption stuff in them. -CRYPT_SRC= authenc.c ext.h state.c telnetd.c termstat.c -CRYPT_SRC+= utility.c Makefile -NOCRYPT_DIR=${.CURDIR}/Nocrypt - .include - -nocrypt: -#ifdef ENCRYPTION - @for i in ${CRYPT_SRC}; do \ - if [ ! -d ${NOCRYPT_DIR} ]; then \ - echo Creating subdirectory ${NOCRYPT_DIR}; \ - mkdir ${NOCRYPT_DIR}; \ - fi; \ - echo ${NOCRYPT_DIR}/$$i; \ - unifdef -UENCRYPTION ${.CURDIR}/$$i | \ - sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \ - done - -placeholder: -#else /* ENCRYPTION */ - @echo "Encryption code already removed." -#endif /* ENCRYPTION */ diff --git a/eBones/usr.bin/telnet/Makefile b/eBones/usr.bin/telnet/Makefile index d751687821e7..87ee4cf6c60f 100644 --- a/eBones/usr.bin/telnet/Makefile +++ b/eBones/usr.bin/telnet/Makefile @@ -31,66 +31,26 @@ # SUCH DAMAGE. # # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $Id$ # PROG= telnet -CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -CFLAGS+=-DENV_HACK +SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ + terminal.c tn3270.c utilities.c + +CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DENCRYPTION CFLAGS+=-I${.CURDIR}/../../lib LDADD+= -L${TELNETOBJDIR} -ltermcap -ltelnet -DPADD+= ${TELNETOBJDIR}/libtelnet.a +DPADD+= ${TELNETOBJDIR}/libtelnet.a ${LIBTERMCAP} -#ifdef ENCRYPTION - -CFLAGS += -DENCRYPTION - -.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \ - || defined(MAKE_KERBEROS)) -CFLAGS+=-DAUTHENTICATION -CFLAGS+= -DKRB4 +.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES)) +CFLAGS+=-DAUTHENTICATION -DKRB4 LDADD+= -ldes -lkrb DPADD+= ${LIBDES} ${LIBKRB} .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} - -SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ - terminal.c tn3270.c utilities.c - -# These are the sources that have encryption stuff in them. -CRYPT_SRC= authenc.c commands.c externs.h main.c network.c -CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile -NOCRYPT_DIR=${.CURDIR}/Nocrypt - .include - -nocrypt: -#ifdef ENCRYPTION - @for i in ${CRYPT_SRC}; do \ - if [ ! -d ${NOCRYPT_DIR} ]; then \ - echo Creating subdirectory ${NOCRYPT_DIR}; \ - mkdir ${NOCRYPT_DIR}; \ - fi; \ - echo ${NOCRYPT_DIR}/$$i; \ - unifdef -UENCRYPTION ${.CURDIR}/$$i | \ - sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \ - done - -placeholder: -#else /* ENCRYPTION */ - @echo "Encryption code already removed." -#endif /* ENCRYPTION */ diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index d8df7be81ef3..94f75499080e 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -3,16 +3,11 @@ LIB= telnet SRCS= encrypt.c genget.c getent.c misc.c -CFLAGS+= -DHAS_CGETENT -.if defined(MAKE_EBONES) - -CFLAGS+= -DENCRYPTION +CFLAGS+= -DHAS_CGETENT -DENCRYPTION .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+= -DDES_ENCRYPTION -DAUTHENTICATION -DKRB4 -I/usr/include/kerberosIV SRCS+= auth.c kerberos.c enc_des.c LDADD+= -ldes -lkrb DPADD+= ${LIBDES} ${LIBKRB} @@ -21,32 +16,8 @@ DPADD+= ${LIBDES} ${LIBKRB} # Not Yet #SRCS += spx.c rsaencpwd.c read_password.c +# KRB4_ENCPWD not yet defined # Used only in krb4encpwd.c and rsaencpwd.c, not yet active #LDADD+= -ldescrypt -.endif /* ENCRYPTION */ - -# These are the sources that have encryption stuff in them. -CRYPT_SRC= auth.c enc-proto.h enc_des.c encrypt.c -CRYPT_SRC+= encrypt.h kerberos.c kerberos5.c krb4encpwd.c -CRYPT_SRC+= misc.c spx.c Makefile -NOCRYPT_DIR=${.CURDIR}/Nocrypt - .include - -nocrypt: -.if defined(ENCRYPTION) - @for i in ${CRYPT_SRC}; do \ - if [ ! -d ${NOCRYPT_DIR} ]; then \ - echo Creating subdirectory ${NOCRYPT_DIR}; \ - mkdir ${NOCRYPT_DIR}; \ - fi; \ - echo ${NOCRYPT_DIR}/$$i; \ - unifdef -UENCRYPTION ${.CURDIR}/$$i | \ - sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \ - done - -placeholder: -.else - @echo "Encryption code already removed." -.endif diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 002dc3fe6f43..c0c82eef6791 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/15/93 +# $Id$ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -12,52 +13,16 @@ SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ DPADD= ${TELNETOBJDIR}/libtelnet.a ${LIBUTIL} ${LIBTERMCAP} LDADD= -L${TELNETOBJDIR} -lutil -ltermcap -ltelnet -CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK -CFLAGS+=-I${.CURDIR}/../../lib +CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON -DENV_HACK +CFLAGS+= -DENCRYPTION -I${.CURDIR}/../../lib -#ifdef ENCRYPTION - -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+=-DAUTHENTICATION LDADD+= -ldes -lkrb DPADD+= ${LIBDES} ${LIBKRB} .endif -#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \ -# || defined(MAKE_KERBEROS)) -#CFLAGS+=-DAUTHENTICATION -#LDADD+= -ldes -lkrb5 -#DPADD+= ${LIBDES} -#.endif - # Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active #LDADD+= -ldescrypt -#endif /* ENCRYPTION */ - -# These are the sources that have encryption stuff in them. -CRYPT_SRC= authenc.c ext.h state.c telnetd.c termstat.c -CRYPT_SRC+= utility.c Makefile -NOCRYPT_DIR=${.CURDIR}/Nocrypt - .include - -nocrypt: -#ifdef ENCRYPTION - @for i in ${CRYPT_SRC}; do \ - if [ ! -d ${NOCRYPT_DIR} ]; then \ - echo Creating subdirectory ${NOCRYPT_DIR}; \ - mkdir ${NOCRYPT_DIR}; \ - fi; \ - echo ${NOCRYPT_DIR}/$$i; \ - unifdef -UENCRYPTION ${.CURDIR}/$$i | \ - sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \ - done - -placeholder: -#else /* ENCRYPTION */ - @echo "Encryption code already removed." -#endif /* ENCRYPTION */ diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index d751687821e7..87ee4cf6c60f 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -31,66 +31,26 @@ # SUCH DAMAGE. # # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $Id$ # PROG= telnet -CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -CFLAGS+=-DENV_HACK +SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ + terminal.c tn3270.c utilities.c + +CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DENCRYPTION CFLAGS+=-I${.CURDIR}/../../lib LDADD+= -L${TELNETOBJDIR} -ltermcap -ltelnet -DPADD+= ${TELNETOBJDIR}/libtelnet.a +DPADD+= ${TELNETOBJDIR}/libtelnet.a ${LIBTERMCAP} -#ifdef ENCRYPTION - -CFLAGS += -DENCRYPTION - -.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \ - || defined(MAKE_KERBEROS)) -CFLAGS+=-DAUTHENTICATION -CFLAGS+= -DKRB4 +.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES)) +CFLAGS+=-DAUTHENTICATION -DKRB4 LDADD+= -ldes -lkrb DPADD+= ${LIBDES} ${LIBKRB} .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} - -SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ - terminal.c tn3270.c utilities.c - -# These are the sources that have encryption stuff in them. -CRYPT_SRC= authenc.c commands.c externs.h main.c network.c -CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile -NOCRYPT_DIR=${.CURDIR}/Nocrypt - .include - -nocrypt: -#ifdef ENCRYPTION - @for i in ${CRYPT_SRC}; do \ - if [ ! -d ${NOCRYPT_DIR} ]; then \ - echo Creating subdirectory ${NOCRYPT_DIR}; \ - mkdir ${NOCRYPT_DIR}; \ - fi; \ - echo ${NOCRYPT_DIR}/$$i; \ - unifdef -UENCRYPTION ${.CURDIR}/$$i | \ - sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \ - done - -placeholder: -#else /* ENCRYPTION */ - @echo "Encryption code already removed." -#endif /* ENCRYPTION */