d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style clean-up, and diff-reduce WRT src/secure/*telnet*/Makefile

Browse Source 
Lost in this commit - KerberosIV compatability. This will be
re-added later.
This commit is contained in:
Mark Murray 2001-11-30 21:14:44 +00:00
parent acf4d74a74
commit d282330c31
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=87143
3 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kerberos5/lib/libtelnet/Makefile
View File

@ -8,28 +8,28 @@ NOPIC= yes
SRCS= genget.c getent.c misc.c encrypt.c auth.c \ SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c sra.c pk.c enc_des.c sra.c pk.c
.if defined(MAKE_KERBEROS4) SRCS+= kerberos5.c
SRCS+= kerberos.c
CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb
.endif
#SRCS+= kerberos5.c #WARNS?= 2
CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
-DSRA -I${TELNETDIR} CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5
#CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5
INCS= ${TELNETDIR}/arpa/telnet.h INCS= ${TELNETDIR}/arpa/telnet.h
INCDIR= /usr/include/arpa INCDIR= /usr/include/arpa
.include <bsd.lib.mk>
.PATH: ${TELNETDIR}/libtelnet
# #
# Remove obsolete shared libraries, if any. We don't bother moving them # Remove obsolete shared libraries, if any. We don't bother moving them
# to /usr/lib/compat, since they were only used by telnet, telnetd and # to /usr/lib/compat, since they were only used by telnet, telnetd and
# tn3270. # tn3270.
# #
beforeinstall: beforeinstall: __remove-stale-libs
__remove-stale-libs: .PHONY
.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0)
-chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
.endif
.include <bsd.lib.mk>
.PATH: ${TELNETDIR}/libtelnet

21
kerberos5/libexec/telnetd/Makefile
View File

@ -6,24 +6,21 @@
PROG= telnetd PROG= telnetd
MAN= telnetd.8 MAN= telnetd.8
CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
-I${TELNETDIR} -DINET6
SRCS= global.c slc.c state.c sys_term.c telnetd.c \ SRCS= global.c slc.c state.c sys_term.c telnetd.c \
termstat.c utility.c authenc.c termstat.c utility.c authenc.c
DPADD= CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
LDADD= -DENV_HACK -DAUTHENTICATION -DENCRYPTION \
-I${TELNETDIR} -DINET6
CFLAGS+= -DKRB5
.if defined(MAKE_KERBEROS4) WARNS?= 2
DPADD+= ${LIBKRB} ${LIBCOM_ERR}
LDADD+= -lkrb -lcom_err
.endif
DPADD+= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
${LIBCRYPT} ${LIBPAM} ${LIBCRYPT} ${LIBPAM}
LDADD+= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
-lkrb5 -lasn1 -lroken -lcom_err \
-lcrypt ${MINUSLPAM} -lcrypt ${MINUSLPAM}
.include <bsd.prog.mk> .include <bsd.prog.mk>

32
kerberos5/usr.bin/telnet/Makefile
View File

@ -2,31 +2,23 @@
PROG= telnet PROG= telnet
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c utilities.c
CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \ -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
-I${TELNETDIR} -I${TELNETDIR} -I${TELNETDIR}/libtelnet/
.if defined(MAKE_KERBEROS4) CFLAGS+= -DKRB5
CFLAGS+= -DKRB4
.endif
#CFLAGS+= -DKRB5 WARNS?= 2
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
telnet.c terminal.c tn3270.c utilities.c ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
DPADD= LDADD= -ltermcap ${LIBTELNET} -lmp \
LDADD= -lkrb5 -lasn1 -lcom_err -lroken \
-lcrypto -lcrypt -lipsec ${MINUSLPAM}
.if defined(MAKE_KERBEROS4)
DPADD+= ${LIBKRB} ${LIBCOM_ERR}
LDADD+= -lkrb -lcom_err
.endif
DPADD+= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
${LIBIPSEC} ${LIBPAM}
LDADD+= -ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
-lipsec ${MINUSLPAM}
.include <bsd.prog.mk> .include <bsd.prog.mk>