mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-25 11:37:56 +00:00
Link everything against libcrypt. ELF builds complain without it.
Clean up the master makefile a bit and add a "dekerberise" target for those who have shot themselves in the foot. Thanks to: Randy Bush
This commit is contained in:
parent
ab6c21a54f
commit
0346639d07
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=43183
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:13 markm Exp $
|
||||
|
||||
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
|
||||
# telnet implementations.
|
||||
@ -13,9 +13,10 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
|
||||
SRCS= global.c slc.c state.c sys_term.c telnetd.c \
|
||||
termstat.c utility.c authenc.c
|
||||
|
||||
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB}
|
||||
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
|
||||
${LIBCRYPT}
|
||||
LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
|
||||
-L${KRBOBJDIR} -lkrb
|
||||
-L${KRBOBJDIR} -lkrb -lcrypt
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $
|
||||
|
||||
PROG= telnet
|
||||
|
||||
@ -9,8 +9,9 @@ CFLAGS+= -DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
|
||||
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
|
||||
telnet.c terminal.c tn3270.c utilities.c
|
||||
|
||||
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB}
|
||||
LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -L${KRBOBJDIR} -lkrb
|
||||
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT}
|
||||
LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
|
||||
-L${KRBOBJDIR} -lkrb -lcrypt
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,15 +1,19 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.9 1998/09/04 22:18:49 markm Exp $
|
||||
|
||||
SUBDIR= include lib libexec usr.bin usr.sbin
|
||||
|
||||
SDIR= ${.CURDIR}/..
|
||||
|
||||
CODAI= ${MAKE} ${MFLAGS} cleandir; \
|
||||
${MAKE} ${MFLAGS} obj; \
|
||||
CODAI= ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
|
||||
${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
|
||||
${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all install
|
||||
|
||||
CODAIN= ${MAKE} ${MFLAGS} cleandir && \
|
||||
${MAKE} ${MFLAGS} obj && \
|
||||
${MAKE} ${MFLAGS} depend all install
|
||||
|
||||
CODAD= ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir; \
|
||||
${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj; \
|
||||
CODAD= ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
|
||||
${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
|
||||
${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all distribute
|
||||
|
||||
# These are the programs which depend on kerberos
|
||||
@ -26,10 +30,26 @@ kprog:
|
||||
cd ${SDIR}/sbin/dump; ${CODAI}
|
||||
cd ${SDIR}/sbin/restore; ${CODAI}
|
||||
|
||||
# These are the programs which depend on kerberos
|
||||
# This target us used to rebuild these programs WITHOUT kerberos
|
||||
dekerberise:
|
||||
cd ${SDIR}/bin/rcp; ${CODAIN}
|
||||
cd ${SDIR}/gnu/usr.bin/cvs; ${CODAIN}
|
||||
cd ${SDIR}/libexec/rlogind; ${CODAIN}
|
||||
cd ${SDIR}/libexec/rshd; ${CODAIN}
|
||||
cd ${SDIR}/usr.bin/login; ${CODAIN}
|
||||
cd ${SDIR}/usr.bin/passwd; ${CODAIN}
|
||||
cd ${SDIR}/usr.bin/rlogin; ${CODAIN}
|
||||
cd ${SDIR}/usr.bin/rsh; ${CODAIN}
|
||||
cd ${SDIR}/usr.bin/su; ${CODAIN}
|
||||
cd ${SDIR}/sbin/dump; ${CODAIN}
|
||||
cd ${SDIR}/sbin/restore; ${CODAIN}
|
||||
|
||||
bootstrap: cleandir obj depend all install kprog
|
||||
|
||||
help-distribute: distribute
|
||||
cd ${SDIR}/bin/rcp; ${CODAD}
|
||||
cd ${SDIR}/gnu/usr.bin/cvs; ${CODAD}
|
||||
cd ${SDIR}/libexec/rlogind; ${CODAD}
|
||||
cd ${SDIR}/libexec/rshd; ${CODAD}
|
||||
cd ${SDIR}/usr.bin/login; ${CODAD}
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:13 markm Exp $
|
||||
|
||||
PROG= kpropd
|
||||
MAN8= ${KRB4DIR}/man/kpropd.8
|
||||
@ -10,8 +10,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/slave \
|
||||
-I${INCLOBJDIR} \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES}
|
||||
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:13 markm Exp $
|
||||
|
||||
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
|
||||
# telnet implementations.
|
||||
@ -13,9 +13,10 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
|
||||
SRCS= global.c slc.c state.c sys_term.c telnetd.c \
|
||||
termstat.c utility.c authenc.c
|
||||
|
||||
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB}
|
||||
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
|
||||
${LIBCRYPT}
|
||||
LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
|
||||
-L${KRBOBJDIR} -lkrb
|
||||
-L${KRBOBJDIR} -lkrb -lcrypt
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $
|
||||
|
||||
PROG= kdestroy
|
||||
MAN1= ${KRB4DIR}/man/kdestroy.1
|
||||
@ -11,8 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/lib/krb \
|
||||
-I${KRB4DIR}/kuser
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES}
|
||||
-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $
|
||||
|
||||
PROG= klist
|
||||
MAN1= ${KRB4DIR}/man/klist.1
|
||||
@ -11,8 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/lib/krb \
|
||||
-I${KRB4DIR}/kuser
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES}
|
||||
-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $
|
||||
|
||||
PROG= telnet
|
||||
|
||||
@ -9,8 +9,9 @@ CFLAGS+= -DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
|
||||
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
|
||||
telnet.c terminal.c tn3270.c utilities.c
|
||||
|
||||
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB}
|
||||
LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -L${KRBOBJDIR} -lkrb
|
||||
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT}
|
||||
LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
|
||||
-L${KRBOBJDIR} -lkrb -lcrypt
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1997/10/02 15:03:20 markm Exp $
|
||||
|
||||
PROG= ext_srvtab
|
||||
MAN8= ${KRB4DIR}/man/ext_srvtab.8
|
||||
@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/lib/krb \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \
|
||||
${LIBDES}
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1998/03/20 17:48:12 markm Exp $
|
||||
|
||||
PROG= kadmind
|
||||
MAN8= ${KRB4DIR}/man/kadmind.8
|
||||
@ -18,9 +18,9 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
LDADD= -L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \
|
||||
-L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
|
||||
-ldes -lcom_err
|
||||
-ldes -lcom_err -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
|
||||
${LIBDES} ${LIBCOM_ERR}
|
||||
${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1997/10/02 15:03:20 markm Exp $
|
||||
|
||||
PROG= kdb_destroy
|
||||
MAN8= ${KRB4DIR}/man/kdb_destroy.8
|
||||
@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/admin \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \
|
||||
${LIBDES}
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${CRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1997/10/02 15:03:21 markm Exp $
|
||||
|
||||
PROG= kdb_edit
|
||||
MAN8= ${KRB4DIR}/man/kdb_edit.8
|
||||
@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/admin \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \
|
||||
${LIBDES}
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1997/10/02 15:03:21 markm Exp $
|
||||
|
||||
PROG= kdb_init
|
||||
MAN8= ${KRB4DIR}/man/kdb_init.8
|
||||
@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/admin \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \
|
||||
${LIBDES}
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1997/10/02 15:03:22 markm Exp $
|
||||
|
||||
PROG= kdb_util
|
||||
MAN8= ${KRB4DIR}/man/kdb_util.8
|
||||
@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/admin \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \
|
||||
${LIBDES}
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1997/10/02 15:03:22 markm Exp $
|
||||
|
||||
PROG= kerberos
|
||||
MAN1= ${KRB4DIR}/man/kerberos.1
|
||||
@ -15,9 +15,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRBOBJDIR} \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
|
||||
-ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES}
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $
|
||||
|
||||
PROG= kip
|
||||
NOMAN= true
|
||||
@ -9,8 +9,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/kadmin \
|
||||
-I${KRBOBJDIR} \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES}
|
||||
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $
|
||||
|
||||
PROG= kprop
|
||||
MAN8= ${KRB4DIR}/man/kprop.8
|
||||
@ -10,8 +10,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/slave \
|
||||
-I${INCLOBJDIR} \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES}
|
||||
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id$
|
||||
# $Id: Makefile,v 1.2 1997/10/02 15:03:23 markm Exp $
|
||||
|
||||
PROG= kstash
|
||||
MAN8= ${KRB4DIR}/man/kstash.8
|
||||
@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \
|
||||
-I${KRB4DIR}/lib/kdb \
|
||||
-I${.CURDIR}/../include
|
||||
LDADD= -L${ROKENOBJDIR} -lroken \
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \
|
||||
${LIBDES}
|
||||
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt
|
||||
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user