From e0c026600db2ed38e34dc46d40214dc3716ca21c Mon Sep 17 00:00:00 2001 From: assar Date: Tue, 13 Feb 2001 16:57:04 +0000 Subject: update build infrastructure for heimdal 0.3e --- kerberos5/usr.bin/k5admin/Makefile | 30 +++++++++++++++++++++++++----- kerberos5/usr.bin/k5destroy/Makefile | 4 +++- kerberos5/usr.bin/k5init/Makefile | 4 +++- kerberos5/usr.bin/k5list/Makefile | 4 +++- kerberos5/usr.bin/k5passwd/Makefile | 4 +++- kerberos5/usr.bin/kadmin/Makefile | 30 +++++++++++++++++++++++++----- kerberos5/usr.bin/kdestroy/Makefile | 4 +++- kerberos5/usr.bin/kinit/Makefile | 4 +++- kerberos5/usr.bin/klist/Makefile | 4 +++- kerberos5/usr.bin/kpasswd/Makefile | 4 +++- 10 files changed, 74 insertions(+), 18 deletions(-) (limited to 'kerberos5/usr.bin') diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile index f50b1da..b9d7fc2 100644 --- a/kerberos5/usr.bin/k5admin/Makefile +++ b/kerberos5/usr.bin/k5admin/Makefile @@ -1,16 +1,34 @@ # $FreeBSD$ PROG= k5admin -SRCS= kadmin.c ank.c cpw.c del.c del_enctype.c get.c rename.c util.c \ - ext.c mod.c init.c dump.c load.c random_password.c \ - krb5_err.h heim_err.h hdb_err.h \ - kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h +SRCS= \ + ank.c \ + cpw.c \ + del.c \ + del_enctype.c \ + dump.c \ + ext.c \ + get.c \ + init.c \ + kadmin.c \ + load.c \ + mod.c \ + rename.c \ + util.c \ + random_password.c \ + kadmin_locl.h \ + krb5_err.h heim_err.h hdb_err.h \ + kadm5/private.h \ + kadm5/admin.h \ + kadm5/kadm5_err.h + CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/hdb \ -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/kadmin \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ @@ -21,7 +39,9 @@ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \ diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile index 8eef021..2e68fe0 100644 --- a/kerberos5/usr.bin/k5destroy/Makefile +++ b/kerberos5/usr.bin/k5destroy/Makefile @@ -16,7 +16,9 @@ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile index 2f5dff4..8ecf26d 100644 --- a/kerberos5/usr.bin/k5init/Makefile +++ b/kerberos5/usr.bin/k5init/Makefile @@ -16,7 +16,9 @@ _krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs _krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile index 6624a37..e25db7d 100644 --- a/kerberos5/usr.bin/k5list/Makefile +++ b/kerberos5/usr.bin/k5list/Makefile @@ -16,7 +16,9 @@ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile index 88c116a..7441b87 100644 --- a/kerberos5/usr.bin/k5passwd/Makefile +++ b/kerberos5/usr.bin/k5passwd/Makefile @@ -14,7 +14,9 @@ CFLAGS+= -I${KRB5DIR}/include \ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \ +LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index f50b1da..b9d7fc2 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -1,16 +1,34 @@ # $FreeBSD$ PROG= k5admin -SRCS= kadmin.c ank.c cpw.c del.c del_enctype.c get.c rename.c util.c \ - ext.c mod.c init.c dump.c load.c random_password.c \ - krb5_err.h heim_err.h hdb_err.h \ - kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h +SRCS= \ + ank.c \ + cpw.c \ + del.c \ + del_enctype.c \ + dump.c \ + ext.c \ + get.c \ + init.c \ + kadmin.c \ + load.c \ + mod.c \ + rename.c \ + util.c \ + random_password.c \ + kadmin_locl.h \ + krb5_err.h heim_err.h hdb_err.h \ + kadm5/private.h \ + kadm5/admin.h \ + kadm5/kadm5_err.h + CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/hdb \ -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/kadmin \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ @@ -21,7 +39,9 @@ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \ diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 8eef021..2e68fe0 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -16,7 +16,9 @@ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 2f5dff4..8ecf26d 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -16,7 +16,9 @@ _krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs _krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile index 6624a37..e25db7d 100644 --- a/kerberos5/usr.bin/klist/Makefile +++ b/kerberos5/usr.bin/klist/Makefile @@ -16,7 +16,9 @@ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken ${_krb4libs} \ + -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 88c116a..7441b87 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -14,7 +14,9 @@ CFLAGS+= -I${KRB5DIR}/include \ _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \ +LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ + -L${VERSOBJDIR} -lvers \ + ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} -- cgit v1.1