diff options
Diffstat (limited to 'kerberos5/usr.sbin')
| -rw-r--r-- | kerberos5/usr.sbin/Makefile | 2 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/k5stash/Makefile | 30 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/kstash/Makefile | 9 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/ktutil/Makefile | 7 |
4 files changed, 4 insertions, 44 deletions
diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile index 45e4fa5..2e722ee 100644 --- a/kerberos5/usr.sbin/Makefile +++ b/kerberos5/usr.sbin/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= k5stash ktutil +SUBDIR= kstash ktutil .include <bsd.subdir.mk> diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile deleted file mode 100644 index b6abde7..0000000 --- a/kerberos5/usr.sbin/k5stash/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD$ - -PROG= k5stash -SRCS= kstash.c hdb_err.h -CFLAGS+= -I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/kdc \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif -LDADD= -L${HDBOBJDIR} -lhdb \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -MAN= kstash.8 - -.include <bsd.prog.mk> - -.PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index b6abde7..cb5a7cc 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= k5stash +PROG= kstash SRCS= kstash.c hdb_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -11,17 +11,12 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif LDADD= -L${HDBOBJDIR} -lhdb \ -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= kstash.8 diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index a07663e..6d8b27a 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -25,18 +25,13 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \ -L${KADM5COBJDIR} -lkadm5clnt \ -lcrypto -lcrypt -lcom_err -lreadline -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ ${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} MAN= ktutil.8 |
