From 3197c29bd1de99eb5100db75bfb4d651f6878fa7 Mon Sep 17 00:00:00 2001 From: markm Date: Wed, 1 Mar 2000 13:50:48 +0000 Subject: KerberosIV is no longer compulsory. This should fix "make release". --- kerberos5/libexec/hprop/Makefile | 2 +- kerberos5/libexec/hpropd/Makefile | 4 ++-- kerberos5/libexec/ipropd-master/Makefile | 4 ++-- kerberos5/libexec/ipropd-slave/Makefile | 4 ++-- kerberos5/libexec/k5admind/Makefile | 7 ++++--- kerberos5/libexec/k5passwdd/Makefile | 2 +- kerberos5/libexec/kadmind/Makefile | 7 ++++--- kerberos5/libexec/kdc/Makefile | 6 +++--- kerberos5/libexec/kpasswdd/Makefile | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) (limited to 'kerberos5/libexec') diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index fb2cf22..4a16d9d 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -12,7 +12,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -lkdb _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} .endif diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index cb74c86..e30543a 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -lkdb _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 81c999e..dc0154b 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 251533c..900e778 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile index 7e55664..f5bb9b1 100644 --- a/kerberos5/libexec/k5admind/Makefile +++ b/kerberos5/libexec/k5admind/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= k5admind -SRCS= kadmind.c server.c version4.c \ +SRCS= kadmind.c server.c \ kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -13,11 +13,12 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) +SRCS+= version4.c _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile index b15f95d..4ec263f 100644 --- a/kerberos5/libexec/k5passwdd/Makefile +++ b/kerberos5/libexec/k5passwdd/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 7e55664..f5bb9b1 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= k5admind -SRCS= kadmind.c server.c version4.c \ +SRCS= kadmind.c server.c \ kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -13,11 +13,12 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) +SRCS+= version4.c _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 4fae3ae..96e3f2a 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -13,11 +13,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} +_krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index b15f95d..4ec263f 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -- cgit v1.1