Fix for new Common Error system.

This commit is contained in:
Mark Murray 1999-09-05 14:07:40 +00:00
parent c08e808e2a
commit 63b51f8be4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=50954
22 changed files with 70 additions and 42 deletions

View File

@ -28,8 +28,8 @@ LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
LDADD+= -lkrb -ldes LDADD+= -lkrb -ldes -lcom_err
DPADD+= ${LIBKRB} ${LIBDES} DPADD+= ${LIBKRB} ${LIBDES} ${LIBCOM_ERR}
DISTRIBUTION= krb DISTRIBUTION= krb
# XXX do we want to mess with this? It's probably not really worth it for # XXX do we want to mess with this? It's probably not really worth it for
# the public freebsd stuff, but others might want it. It's an optional # the public freebsd stuff, but others might want it. It's an optional

View File

@ -14,9 +14,9 @@ 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= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
${LIBCRYPT} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
-L${KRBOBJDIR} -lkrb -lcrypt -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -9,9 +9,10 @@ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c telnet.c terminal.c tn3270.c utilities.c
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \
${LIBCOM_ERR}
LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
-L${KRBOBJDIR} -lkrb -lcrypt -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
MAINTAINER= markm@FreeBSD.org
SUBDIR= include lib libexec usr.bin usr.sbin SUBDIR= include lib libexec usr.bin usr.sbin
SDIR= ${.CURDIR}/.. SDIR= ${.CURDIR}/..

View File

@ -8,8 +8,9 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/kafs \ -I${KRB4DIR}/lib/kafs \
-I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/krb \
-I${KRB4DIR}/appl/kauth -I${KRB4DIR}/appl/kauth
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -7,8 +7,9 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/roken \
-I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/krb \
-I${KRB4DIR}/appl/kip -I${KRB4DIR}/appl/kip
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -10,8 +10,9 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/slave \ -I${KRB4DIR}/slave \
-I${INCLOBJDIR} \ -I${INCLOBJDIR} \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -14,9 +14,9 @@ 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= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \
${LIBCRYPT} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
-L${KRBOBJDIR} -lkrb -lcrypt -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -9,8 +9,9 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/krb \
-I${KRB4DIR}/appl/kauth -I${KRB4DIR}/appl/kauth
LDADD= -L${ROKENOBJDIR} -lroken -L${KAFSOBJDIR} -lkafs \ LDADD= -L${ROKENOBJDIR} -lroken -L${KAFSOBJDIR} -lkafs \
-L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/krb \
-I${KRB4DIR}/kuser -I${KRB4DIR}/kuser
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -10,8 +10,8 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/krb \
-I${KRB4DIR}/kuser -I${KRB4DIR}/kuser
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/krb \
-I${KRB4DIR}/kuser -I${KRB4DIR}/kuser
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -9,9 +9,10 @@ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c telnet.c terminal.c tn3270.c utilities.c
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} \
${LIBCOM_ERR}
LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \
-L${KRBOBJDIR} -lkrb -lcrypt -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/krb \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/admin \ -I${KRB4DIR}/admin \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${CRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/admin \ -I${KRB4DIR}/admin \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/admin \ -I${KRB4DIR}/admin \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/admin \ -I${KRB4DIR}/admin \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -15,8 +15,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRBOBJDIR} \ -I${KRBOBJDIR} \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -9,8 +9,9 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/kadmin \ -I${KRB4DIR}/kadmin \
-I${KRBOBJDIR} \ -I${KRBOBJDIR} \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -10,8 +10,9 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/slave \ -I${KRB4DIR}/slave \
-I${INCLOBJDIR} \ -I${INCLOBJDIR} \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -11,8 +11,10 @@ CFLAGS+= -I${KRB4DIR}/include \
-I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/kdb \
-I${.CURDIR}/../include -I${.CURDIR}/../include
LDADD= -L${ROKENOBJDIR} -lroken \ LDADD= -L${ROKENOBJDIR} -lroken \
-L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} -lcom_err
DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} \
${LIBCOM_ERR}
.include <bsd.prog.mk> .include <bsd.prog.mk>