aboutsummaryrefslogtreecommitdiff
path: root/kerberos5/libexec
diff options
context:
space:
mode:
authorMark Murray <markm@FreeBSD.org>2000-03-01 13:50:48 +0000
committerMark Murray <markm@FreeBSD.org>2000-03-01 13:50:48 +0000
commitb825cbde0301c29a6c8930a8f64e291fdcda8606 (patch)
tree5f47309c450bba6f71d0945008290d0fedf73f6a /kerberos5/libexec
parent87faa07bec7b6e1212692fbaa21d663ee288abe8 (diff)
downloadsrc-b825cbde0301c29a6c8930a8f64e291fdcda8606.tar.gz
src-b825cbde0301c29a6c8930a8f64e291fdcda8606.zip
KerberosIV is no longer compulsory. This should fix "make release".
Notes
Notes: svn path=/head/; revision=57672
Diffstat (limited to 'kerberos5/libexec')
-rw-r--r--kerberos5/libexec/hprop/Makefile2
-rw-r--r--kerberos5/libexec/hpropd/Makefile4
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile4
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile4
-rw-r--r--kerberos5/libexec/k5admind/Makefile7
-rw-r--r--kerberos5/libexec/k5passwdd/Makefile2
-rw-r--r--kerberos5/libexec/kadmind/Makefile7
-rw-r--r--kerberos5/libexec/kdc/Makefile6
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile2
9 files changed, 20 insertions, 18 deletions
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index fb2cf2263310..4a16d9dcea3e 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 cb74c865bada..e30543ac0c94 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 81c999eb4652..dc0154bec088 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 251533c45d3e..900e778831ab 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 7e55664f186a..f5bb9b15ffd7 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 b15f95dca497..4ec263fe5ad8 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 7e55664f186a..f5bb9b15ffd7 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 4fae3aea4b27..96e3f2a0daea 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 b15f95dca497..4ec263fe5ad8 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