summaryrefslogtreecommitdiffstats
path: root/kerberos5/lib
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-03-09 21:56:55 +0000
committermarkm <markm@FreeBSD.org>2003-03-09 21:56:55 +0000
commit2abe88edc138f2f3133b9137f8f8ea1f6538d0d1 (patch)
tree6557f4e3c58b45ff66d349c451529958a6090b7e /kerberos5/lib
parente784833e45f860b5dd501b0e7ad1de3a7817f980 (diff)
downloadFreeBSD-src-2abe88edc138f2f3133b9137f8f8ea1f6538d0d1.zip
FreeBSD-src-2abe88edc138f2f3133b9137f8f8ea1f6538d0d1.tar.gz
Post KerberosIV de-orbit: Clean up Kerberos5. We dont need KerberosIV
compatiblity mode anymore. Rename the k5foo utils to kfoo (after repo-copy).
Diffstat (limited to 'kerberos5/lib')
-rw-r--r--kerberos5/lib/Makefile7
-rw-r--r--kerberos5/lib/libkafs5/Makefile15
-rw-r--r--kerberos5/lib/libkrb5/Makefile3
-rw-r--r--kerberos5/lib/libtelnet/Makefile4
4 files changed, 2 insertions, 27 deletions
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index f34d30e..f94bb0a 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi
-.if defined(MAKE_KERBEROS4)
-SUBDIR+=libkafs5
-.endif
-SUBDIR+=libtelnet
+SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi libtelnet
+
.include <bsd.subdir.mk>
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
deleted file mode 100644
index 782800a..0000000
--- a/kerberos5/lib/libkafs5/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-LIB= kafs5
-CFLAGS+=-I${KRB5DIR}/lib/kafs \
- -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/include \
- -I${KRB5OBJDIR} \
- -I${ASN1OBJDIR}
-SRCS= afssys.c afskrb5.c common.c
-
-.include <bsd.lib.mk>
-
-.PATH: ${KRB5DIR}/lib/kafs
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index cc6a10f..63b62c0 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -8,9 +8,6 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/include \
-I${KRB5OBJDIR} \
-I${ASN1OBJDIR}
-.if defined(MAKE_KERBEROS4)
-CFLAGS+=-I${KRB4DIR}/include
-.endif
SRCS= \
acl.c \
add_et_list.c \
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index c5ef16e..223df03 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -6,10 +6,6 @@ INTERNALLIB= yes
SRCS= genget.c getent.c misc.c encrypt.c auth.c \
enc_des.c sra.c pk.c
-.if defined(MAKE_KERBEROS4)
-SRCS+= kerberos.c
-CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb
-.endif
SRCS+= kerberos5.c
#WARNS?= 2
OpenPOWER on IntegriCloud