summaryrefslogtreecommitdiffstats
path: root/kerberos5/usr.bin
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2000-03-23 14:56:47 +0000
committermarkm <markm@FreeBSD.org>2000-03-23 14:56:47 +0000
commitc1ba294b4dc4c06a5a3eb30dd42de5407256f522 (patch)
tree83d68d7658e08e3e7d56dae4e21c5e4c788457a8 /kerberos5/usr.bin
parenta0e94fcb09894a5e29c41807097db8dda464c432 (diff)
downloadFreeBSD-src-c1ba294b4dc4c06a5a3eb30dd42de5407256f522.zip
FreeBSD-src-c1ba294b4dc4c06a5a3eb30dd42de5407256f522.tar.gz
Properly separate the K5-only buld from K4.
Submitted by: sheldonh
Diffstat (limited to 'kerberos5/usr.bin')
-rw-r--r--kerberos5/usr.bin/k5admin/Makefile3
-rw-r--r--kerberos5/usr.bin/k5destroy/Makefile4
-rw-r--r--kerberos5/usr.bin/k5init/Makefile4
-rw-r--r--kerberos5/usr.bin/k5list/Makefile4
-rw-r--r--kerberos5/usr.bin/k5passwd/Makefile3
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile3
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile4
-rw-r--r--kerberos5/usr.bin/kinit/Makefile4
-rw-r--r--kerberos5/usr.bin/klist/Makefile4
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile3
10 files changed, 26 insertions, 10 deletions
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index 43cc5a5..f50b1da 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -15,7 +15,8 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
index d8d9f3f..8eef021 100644
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -4,12 +4,14 @@ PROG= k5destroy
SRCS= kdestroy.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
index 4c5b470..2f5dff4 100644
--- a/kerberos5/usr.bin/k5init/Makefile
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -4,12 +4,14 @@ PROG= k5init
SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
index 6e2f0c1..6624a37 100644
--- a/kerberos5/usr.bin/k5list/Makefile
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -4,12 +4,14 @@ PROG= k5list
SRCS= klist.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
index be2b77d..88c116a 100644
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -9,7 +9,8 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kpasswd \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 43cc5a5..f50b1da 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -15,7 +15,8 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${ASN1OBJDIR} \
-I${HDBOBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index d8d9f3f..8eef021 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -4,12 +4,14 @@ PROG= k5destroy
SRCS= kdestroy.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 4c5b470..2f5dff4 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -4,12 +4,14 @@ PROG= k5init
SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index 6e2f0c1..6624a37 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -4,12 +4,14 @@ PROG= k5list
SRCS= klist.c krb5_err.h heim_err.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kuser \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index be2b77d..88c116a 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -9,7 +9,8 @@ CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/kpasswd \
-I${ASN1OBJDIR} \
-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && \
+ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
OpenPOWER on IntegriCloud