head	1.18;
access;
symbols
	RELENG_2_2_8_RELEASE:1.15.2.1
	RELENG_2_2_7_RELEASE:1.15.2.1
	RELENG_2_2_6_RELEASE:1.15.2.1
	RELENG_2_2_5_RELEASE:1.15
	RELENG_2_2_2_RELEASE:1.15
	RELENG_2_2_1_RELEASE:1.15
	RELENG_2_2_0_RELEASE:1.15
	RELENG_2_2:1.15.0.2
	RELENG_2_2_BP:1.15
	BSD4_4Lite:1.1.1.1
	CSRG:1.1.1;
locks; strict;
comment	@# @;


1.18
date	97.10.03.09.49.00;	author markm;	state dead;
branches;
next	1.17;

1.17
date	97.02.22.14.38.00;	author peter;	state Exp;
branches;
next	1.16;

1.16
date	97.01.14.05.42.01;	author jkh;	state Exp;
branches;
next	1.15;

1.15
date	96.03.11.16.17.17;	author markm;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	96.03.11.06.22.50;	author markm;	state Exp;
branches;
next	1.13;

1.13
date	96.03.10.21.15.00;	author markm;	state Exp;
branches;
next	1.12;

1.12
date	96.03.09.13.36.34;	author ache;	state Exp;
branches;
next	1.11;

1.11
date	95.10.11.00.03.59;	author gibbs;	state Exp;
branches;
next	1.10;

1.10
date	95.09.14.21.29.05;	author gibbs;	state Exp;
branches;
next	1.9;

1.9
date	95.08.05.19.10.17;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	95.07.24.22.55.35;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	95.07.24.21.57.58;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	95.07.24.21.49.06;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	95.07.24.21.38.32;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	95.07.24.21.10.47;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	95.07.24.20.29.12;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	95.07.20.11.39.16;	author pst;	state Exp;
branches;
next	1.1;

1.1
date	94.08.12.22.02.56;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.08.12.22.02.57;	author csgr;	state Exp;
branches
	1.1.1.1.6.1;
next	;

1.1.1.1.6.1
date	95.09.15.18.18.44;	author gibbs;	state Exp;
branches;
next	1.1.1.1.6.2;

1.1.1.1.6.2
date	95.10.11.00.12.10;	author gibbs;	state Exp;
branches;
next	1.1.1.1.6.3;

1.1.1.1.6.3
date	95.10.29.06.54.59;	author davidg;	state Exp;
branches;
next	1.1.1.1.6.4;

1.1.1.1.6.4
date	96.06.21.17.29.02;	author markm;	state Exp;
branches;
next	1.1.1.1.6.5;

1.1.1.1.6.5
date	96.06.30.12.50.37;	author markm;	state Exp;
branches;
next	;

1.15.2.1
date	98.02.18.13.21.23;	author markm;	state dead;
branches;
next	;


desc
@@


1.18
log
@*GULP* Punt this into the attic. It is no longer used.
@
text
@#	From: @@(#)Makefile	8.2 (Berkeley) 12/15/93
#	$Id: Makefile,v 1.17 1997/02/22 14:38:00 peter Exp $

LIB=	telnet
SRCS=   encrypt.c genget.c getent.c misc.c

CFLAGS+= -DHAS_CGETENT -DENCRYPTION

.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES)
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION -DKRB4 -I/usr/include/kerberosIV
SRCS+=  auth.c kerberos.c enc_des.c
LDADD+= -ldes -lkrb
DPADD+= ${LIBDES} ${LIBKRB}
.endif

# 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

.include <bsd.lib.mk>
@


1.17
log
@Revert $FreeBSD$ to $Id$
@
text
@d2 1
a2 1
#	$Id$
@


1.16
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d2 1
a2 1
#	$FreeBSD$
@


1.15
log
@Big clean-up job. Remove ancient and never-to-be used stuff.
The look much more like BSD Makefiles now.
@
text
@d2 1
a2 1
#	$Id$
@


1.15.2.1
log
@Punt this into the attic. KerberosIV (KTH eBones) has been tagged into
the tree and the userland changes have been merged.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.15 1996/03/11 16:17:17 markm Exp $
@


1.14
log
@Fix typo #ifdef -> .if defined().
Tidy uo this file a bit.
@
text
@a5 1
CFLAGS+= -DHAS_CGETENT
d7 1
a7 3
.if defined(MAKE_EBONES)

CFLAGS+= -DENCRYPTION
d10 1
a10 3
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
# KRB4_ENCPWD not yet defined
d19 1
a22 8
.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

a23 17

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
@


1.13
log
@Fix typo - -des -> -ldes
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.12 1996/03/09 13:36:34 ache Exp $
d8 1
a8 1
#ifdef	ENCRYPTION
d12 1
a12 2
.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
	|| defined(MAKE_KERBEROS))
a15 1
#CFLAGS+= -DKRB4_ENCPWD
a16 2
# KRB4_ENCPWD not yet defined
#SRCS+=   krb4encpwd.c read_password.c
a20 9
#.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

d27 1
a27 1
#endif	/* ENCRYPTION */
d38 1
a38 1
#ifdef	ENCRYPTION
d50 1
a50 1
#else	/* ENCRYPTION */
d52 1
a52 1
#endif	/* ENCRYPTION */
@


1.12
log
@Sense MAKE_EBONES, DESTDIR
SRCS cleanup
DPADD cleanup
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.11 1995/10/11 00:03:59 gibbs Exp $
d21 1
a21 1
LDADD+= -des -lkrb
@


1.11
log
@Remove MAKE_EBONES conditionals.  They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.10 1995/09/14 21:29:05 gibbs Exp $
d5 1
a5 3
SRCS=   auth.c encrypt.c genget.c getent.c misc.c
SRCS+=  enc_des.c
SRCS+=	spx.c rsaencpwd.c read_password.c
d10 1
a10 1
CFLAGS+= -DENCRYPTION -DAUTHENTICATION
d12 4
a15 2
.if exists(/usr/lib/libkrb.a)
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION
d18 1
a18 1
SRCS+=  kerberos.c
d20 3
a22 2
#SRCS+=   krb4encpwd.c
LDADD+= -ldes -lkrb
d25 11
a35 5
.if exists(/usr/lib/libkrb5.a)
CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION
SRCS+=	kerberos5.c forward.c
LDADD+= -ldes -lkrb5
.endif
@


1.10
log
@Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES.
Fix up some of the des calls to be compatible with eBones.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.9 1995/08/05 19:10:17 ache Exp $
a13 1
.ifdef  MAKE_EBONES
a21 1
.endif
@


1.9
log
@Comment out LDADD+=-ldescrypt, it is not yet active due to
missng defines for krb4encpwd and rsaencpwd and missing rsa library too.
@
text
@d2 1
a2 5
#	$Id: Makefile,v 1.8 1995/07/24 22:55:35 ache Exp $

# This stuff need original libdes to run (new_rnd_key.c module),
# current eBones/des lib don't have it
# Kerberos4 stuff ifdefed by MAKE_KERBEROS (make.conf) because of it
d14 1
a14 1
.ifdef  MAKE_KERBEROS
@


1.8
log
@Final cleanup pass through Makefiles, now this stuff
autodetect kerberos/eBones and work even with eBones,
but with reduced functionality (don't pick up des/krb stuff
in this case)
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.7 1995/07/24 21:57:58 ache Exp $
d36 2
a37 1
LDADD+= -ldescrypt
@


1.7
log
@Add LDADD+= -ldescrypt
Reviewed by:
Submitted by:
Obtained from:
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.6 1995/07/24 21:49:06 ache Exp $
d15 2
a16 2
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DDES_ENCRYPTION
LDADD+= -ldescrypt
d20 1
a20 1
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
d26 1
a26 1
LDADD+= -lkrb -ldes
d31 1
a31 1
CFLAGS+= -DKRB5 -DFORWARD
d33 1
a33 1
LDADD+= -lkrb5 -ldes
d35 2
@


1.6
log
@Move -ldes under kerb stuff, my fault
Reviewed by:
Submitted by:
Obtained from:
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.5 1995/07/24 21:38:32 ache Exp $
d16 1
@


1.5
log
@Since this stuff not works with eBones, ifdef kerberos stuff
with MAKE_KERBEROS to allow other things to live
Submitted by:
Obtained from:
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.4 1995/07/24 21:10:47 ache Exp $
d25 1
a25 1
LDADD+= -lkrb
d32 1
a32 1
LDADD+= -lkrb5
a33 2

LDADD+= -ldes
@


1.4
log
@Add comment about new_rbd_key.c module needed from
original libdes
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.3 1995/07/24 20:29:12 ache Exp $
d6 1
d17 1
d26 1
@


1.3
log
@Fix many bogus things, typing error, dependance errors, etc.,
now it compiles.
Note: this stuff requires original libdes, not libdes from
Eric Yang which we have in eBones.
@
text
@d2 4
a5 1
#	$Id: Makefile,v 1.2 1995/07/20 11:39:16 pst Exp $
@


1.2
log
@Update telnet to the 95.05.31 release.

Obtained from:	Dave Borman <dab@@cray.com>
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.1.1.1 1994/08/12 22:02:57 csgr Exp $
d5 2
a6 2
SRCS=	auth.c encrypt.c genget.c getent.c misc.c
SRCS+=	kerberos.c enc_des.c
d11 1
a11 1
CFLAGS+= -DENCRYPTION -DAUTHENTICATION
d14 7
a20 2
CFLAGS+= -DKRB4 -DKRB4_ENCPWD -DDES_ENCRYPTION -I/usr/include/kerberosIV
SRCS+=   krb4encpwd.c
d24 1
a24 1
CFLAGS+= -DKRB5 -DDES_ENCRYPTION -DFORWARD
d26 1
d28 3
@


1.1
log
@Initial revision
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.2 1994/08/05 02:02:36 wollman Exp $
d7 1
a7 1
#SRCS+=	kerberos5.c
d9 14
@


1.1.1.1
log
@Libtelnet with encryption goes walkies to src/secure/lib
Reviewed by:	Geoff Rehmet
@
text
@@


1.1.1.1.6.1
log
@Merge with HEAD.  Brings in new secure telnet suite + eBones fixes.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.10 1995/09/14 21:29:05 gibbs Exp $
d5 3
a7 3
SRCS=   auth.c encrypt.c genget.c getent.c misc.c
SRCS+=  enc_des.c
SRCS+=	spx.c rsaencpwd.c read_password.c
a8 27

#ifdef	ENCRYPTION

CFLAGS+= -DENCRYPTION -DAUTHENTICATION

.ifdef  MAKE_EBONES
.if exists(/usr/lib/libkrb.a)
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION
# KRB4_ENCPWD not yet defined
#CFLAGS+= -DKRB4_ENCPWD
SRCS+=  kerberos.c
# KRB4_ENCPWD not yet defined
#SRCS+=   krb4encpwd.c
LDADD+= -ldes -lkrb
.endif
.endif

.if exists(/usr/lib/libkrb5.a)
CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION
SRCS+=	kerberos5.c forward.c
LDADD+= -ldes -lkrb5
.endif

# Used only in krb4encpwd.c and rsaencpwd.c, not yet active
#LDADD+= -ldescrypt

#endif	/* ENCRYPTION */
@


1.1.1.1.6.2
log
@Remove MAKE_EBONES conditionals.  Besides being wrong, this was what screwed
up secure telnet in the previous snapshots.
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.11 1995/10/11 00:03:59 gibbs Exp $
d14 1
d23 1
@


1.1.1.1.6.3
log
@Put telnet, telnetd, and libtelnet in the krb distribution where they
belong. They should be actually moved in the source tree to be under
eBones, but I don't want to mess with that now. This should hopefully
fix the main problem people were having when they selected the "des"
distribution and not krb, but got the Kerberos version of telnet and
friends as a side effect.

Submitted by:	Justin Gibbs <gibbs>
@
text
@d2 1
a2 1
#	$Id: Makefile,v 1.1.1.1.6.2 1995/10/11 00:12:10 gibbs Exp $
a4 1
DISTRIBUTION= krb
@


1.1.1.1.6.4
log
@Merge with HEAD
@
text
@d2 1
a2 1
#	$Id$
d5 5
a9 1
SRCS=   encrypt.c genget.c getent.c misc.c
d11 1
a11 1
CFLAGS+= -DHAS_CGETENT -DENCRYPTION
d13 9
a21 3
.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES)
CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION -DKRB4 -I/usr/include/kerberosIV
SRCS+=  auth.c kerberos.c enc_des.c
a22 1
DPADD+= ${LIBDES} ${LIBKRB}
d25 5
a29 2
# Not Yet
#SRCS += spx.c rsaencpwd.c read_password.c
a30 1
# KRB4_ENCPWD not yet defined
d34 8
d43 17
@


1.1.1.1.6.5
log
@Make telnet part of the krb distribution
@
text
@a3 2
DISTRIBUTION=	krb

@
