libkrb depends on libdes, patch in private mail from

Harold Gutch logix at foobar franken de
This commit is contained in:
lha 2003-08-23 23:03:42 +00:00
parent 2da7435114
commit afad8d1f7c
7 changed files with 31 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2003/07/23 08:01:29 itojun Exp $ # $NetBSD: Makefile,v 1.15 2003/08/23 23:03:42 lha Exp $
NOLINT= # defined NOLINT= # defined
@ -17,8 +17,8 @@ CPPFLAGS+= -DKRB4
CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
SRCS+= version4.c SRCS+= version4.c
KRB4LDADD= -lkadm -lkrb KRB4LDADD= -lkadm -lkrb -ldes
KRB4DPADD= ${LIBKADM} ${LIBKRB} KRB4DPADD= ${LIBKADM} ${LIBKRB} ${LIBDES}
.endif .endif
SRCS+= kadmind.c \ SRCS+= kadmind.c \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2003/07/23 08:01:33 itojun Exp $ # $NetBSD: Makefile,v 1.15 2003/08/23 23:03:44 lha Exp $
NOLINT= # defined NOLINT= # defined
@ -19,8 +19,8 @@ foo:
.if ${MKKERBEROS4} != "no" .if ${MKKERBEROS4} != "no"
CPPFLAGS+= -DKRB4 CPPFLAGS+= -DKRB4
CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
KRB4LDADD= -lkrb KRB4LDADD= -lkrb -ldes
KRB4DPADD= ${LIBKRB} KRB4DPADD= ${LIBKRB} ${LIBDES}
.endif .endif
CPPFLAGS+= -I. \ CPPFLAGS+= -I. \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.39 2003/07/23 08:01:35 itojun Exp $ # $NetBSD: Makefile,v 1.40 2003/08/23 23:03:43 lha Exp $
# @(#)Makefile 8.1 (Berkeley) 7/19/93 # @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -27,8 +27,8 @@ LDADD+= -lkrb5 -lasn1
.if (${USE_KERBEROS4} != "no") .if (${USE_KERBEROS4} != "no")
SRCS+= klogin.c SRCS+= klogin.c
CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV
DPADD+= ${LIBKRB} DPADD+= ${LIBKRB} ${LIBDES}
LDADD+= -lkrb LDADD+= -lkrb -ldes
.endif .endif
.if (${USE_KERBEROS4} != "no" || ${USE_KERBEROS} != "no") .if (${USE_KERBEROS4} != "no" || ${USE_KERBEROS} != "no")

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2003/07/24 15:31:57 itojun Exp $ # $NetBSD: Makefile,v 1.17 2003/08/23 23:03:44 lha Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -16,9 +16,14 @@ CPPFLAGS+=-DKRB5 -DAFS -I${DESTDIR}/usr/include/krb5
LDADD+= -lkrb5 -lkafs -lasn1 LDADD+= -lkrb5 -lkafs -lasn1
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1}
.if ${MKKERBEROS4} != "no"
CPPFLAGS+=-DKRB4 -I${DESTDIR}/usr/include/kerberosIV CPPFLAGS+=-DKRB4 -I${DESTDIR}/usr/include/kerberosIV
LDADD+= -lkrb -lcom_err -lroken LDADD+= -lkrb -ldes
DPADD+= ${LIBKRB} ${LIBCOM_ERR} ${LIBROKEN} DPADD+= ${LIBKRB} ${LIBDES}
.endif
LDADD+= -lcom_err -lroken
DPADD+= ${LIBCOM_ERR} ${LIBROKEN}
.endif .endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.18 2003/07/24 15:31:57 itojun Exp $ # $NetBSD: Makefile,v 1.19 2003/08/23 23:03:45 lha Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -22,10 +22,15 @@ SRCS+= auth-krb5.c auth2-krb5.c
LDADD+= -lkrb5 -lkafs -lasn1 LDADD+= -lkrb5 -lkafs -lasn1
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1}
.if ${MKKERBEROS4} != "no"
CPPFLAGS+=-DKRB4 -I${DESTDIR}/usr/include/kerberosIV CPPFLAGS+=-DKRB4 -I${DESTDIR}/usr/include/kerberosIV
SRCS+= auth-krb4.c SRCS+= auth-krb4.c
LDADD+= -lkrb -lcom_err -lroken LDADD+= -lkrb -ldes
DPADD+= ${LIBKRB} ${LIBCOM_ERR} ${LIBROKEN} DPADD+= ${LIBKRB} ${LIBDES}
.endif
LDADD+= -lcom_err -lroken
DPADD+= ${LIBCOM_ERR} ${LIBROKEN}
.endif .endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.32 2003/08/20 14:11:17 christos Exp $ # $NetBSD: Makefile,v 1.33 2003/08/23 23:03:44 lha Exp $
# from: @(#)Makefile 8.1 (Berkeley) 7/19/93 # from: @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -33,8 +33,8 @@ LDADD+= -lkrb5 -lasn1
.if (${USE_KERBEROS4} != "no") .if (${USE_KERBEROS4} != "no")
CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV CPPFLAGS+=-DKERBEROS -I${DESTDIR}/usr/include/kerberosIV
DPADD+= ${LIBKRB} DPADD+= ${LIBKRB} ${LIBDES}
LDADD+= -lkrb LDADD+= -lkrb -ldes
.endif .endif
DPADD+= ${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR} DPADD+= ${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2003/07/23 08:01:41 itojun Exp $ # $NetBSD: Makefile,v 1.10 2003/08/23 23:03:45 lha Exp $
NOLINT= # defined NOLINT= # defined
@ -14,8 +14,8 @@ PROG= kdc
.if ${MKKERBEROS4} != "no" .if ${MKKERBEROS4} != "no"
CPPFLAGS+= -DKRB4 CPPFLAGS+= -DKRB4
CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV CPPFLAGS+= -I${DESTDIR}/usr/include/kerberosIV
KRB4LDADD= -lkrb KRB4LDADD= -lkrb -ldes
KRB4DPADD= ${LIBKRB} KRB4DPADD= ${LIBKRB} ${LIBDES}
SRCS+= kaserver.c SRCS+= kaserver.c