From 495eff2a20335a0938b00911310ea73a967429a7 Mon Sep 17 00:00:00 2001 From: ru Date: Wed, 2 Jul 2003 23:46:39 +0000 Subject: Fixed "make checkdpadd". OK'ed by: markm --- kerberos5/Makefile.inc | 38 ++++---------------------------- kerberos5/libexec/hprop/Makefile | 8 +++---- kerberos5/libexec/hpropd/Makefile | 8 +++---- kerberos5/libexec/ipropd-master/Makefile | 10 +++------ kerberos5/libexec/ipropd-slave/Makefile | 10 +++------ kerberos5/libexec/kadmind/Makefile | 11 +++------ kerberos5/libexec/kdc/Makefile | 8 +++---- kerberos5/libexec/kpasswdd/Makefile | 8 +++---- kerberos5/libexec/telnetd/Makefile | 3 +-- kerberos5/usr.bin/kadmin/Makefile | 17 ++++++-------- kerberos5/usr.bin/kdestroy/Makefile | 8 +++---- kerberos5/usr.bin/kinit/Makefile | 8 +++---- kerberos5/usr.bin/klist/Makefile | 8 +++---- kerberos5/usr.bin/kpasswd/Makefile | 7 +++--- kerberos5/usr.bin/ksu/Makefile | 8 +++---- kerberos5/usr.bin/telnet/Makefile | 3 +-- kerberos5/usr.sbin/kstash/Makefile | 9 +++----- kerberos5/usr.sbin/ktutil/Makefile | 16 +++++--------- 18 files changed, 58 insertions(+), 130 deletions(-) (limited to 'kerberos5') diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index fd6b015..111f943 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -45,9 +45,9 @@ ROKENOBJDIR= ${.CURDIR}/../../lib/libroken .endif .if exists(${.OBJDIR}/../../lib/libvers) -VERSOBJDIR= ${.OBJDIR}/../../lib/libvers +LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a .else -VERSOBJDIR= ${.CURDIR}/../../lib/libvers +LIBVERS= ${.CURDIR}/../../lib/libvers/libvers.a .endif .if exists(${.OBJDIR}/../../lib/libkrb5) @@ -56,40 +56,10 @@ KRB5OBJDIR= ${.OBJDIR}/../../lib/libkrb5 KRB5OBJDIR= ${.CURDIR}/../../lib/libkrb5 .endif -.if exists(${.OBJDIR}/../../lib/libkadm5clnt) -KADM5COBJDIR= ${.OBJDIR}/../../lib/libkadm5clnt -.else -KADM5COBJDIR= ${.CURDIR}/../../lib/libkadm5clnt -.endif - -.if exists(${.OBJDIR}/../../lib/libkadm5srv) -KADM5SOBJDIR= ${.OBJDIR}/../../lib/libkadm5srv -.else -KADM5SOBJDIR= ${.CURDIR}/../../lib/libkadm5srv -.endif - -.if exists(${.OBJDIR}/../../lib/libkafs5) -KAFS5OBJDIR= ${.OBJDIR}/../../lib/libkafs5 -.else -KAFS5OBJDIR= ${.CURDIR}/../../lib/libkafs5 -.endif - -.if exists(${.OBJDIR}/../../lib/libkrb5util) -KRB5UTILOBJDIR= ${.OBJDIR}/../../lib/libkrb5util -.else -KRB5UTILOBJDIR= ${.CURDIR}/../../lib/libkrb5util -.endif - -.if exists(${.OBJDIR}/../../lib/libkdb5) -KDB5OBJDIR= ${.OBJDIR}/../../lib/libkdb5 -.else -KDB5OBJDIR= ${.CURDIR}/../../lib/libkdb5 -.endif - .if exists(${.OBJDIR}/../../lib/libsl) -SLOBJDIR= ${.OBJDIR}/../../lib/libsl +LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a .else -SLOBJDIR= ${.CURDIR}/../../lib/libsl +LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a .endif .if exists(${.OBJDIR}/../../lib/libtelnet) diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index 20db261..0c6e4b3 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -12,11 +12,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lkafs5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= hprop.8 diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index 606d65d..4940c2a 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -13,11 +13,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= hpropd.8 diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 544a94d..429cafd 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -13,13 +13,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 3d304d4..b0880f3 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -13,13 +13,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 3f74663..41354cf 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -15,14 +15,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ +LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 5526063..365841d 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -21,11 +21,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kdc.8 diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index 1d82ce0..8a0881d 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -14,11 +14,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kpasswdd.8 diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile index 8ea60d4..9bf0356 100644 --- a/kerberos5/libexec/telnetd/Makefile +++ b/kerberos5/libexec/telnetd/Makefile @@ -20,8 +20,7 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \ ${LIBCRYPT} ${LIBPAM} LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ - -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \ - -L${ROKENOBJDIR} -lroken -lcom_err \ + -lkrb5 -lasn1 -lroken -lcom_err \ -lcrypt ${MINUSLPAM} .include diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index ee6681b..64f5bc3 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -34,16 +34,13 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \ - -L${SLOBJDIR} -lsl -lreadline -lcurses ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ +LDADD= -lkadm5clnt -lkadm5srv -lkrb5 -lroken \ + ${LIBVERS} -lhdb -lasn1 \ + -lcrypto -lcrypt -lcom_err \ + ${LIBSL} -lreadline -lcurses ${LDAPLDADD} +DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN} \ + ${LIBVERS} ${LIBHDB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ ${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS} MAN= kadmin.8 diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 51233ea..12a7bb7 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -10,11 +10,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 2d2f780..2550bd5 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -11,11 +11,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile index d1db57c..ed1eb74 100644 --- a/kerberos5/usr.bin/klist/Makefile +++ b/kerberos5/usr.bin/klist/Makefile @@ -10,11 +10,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 20b0913..5d3a32f 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -9,10 +9,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile index 50699e2..540d596 100644 --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -11,11 +11,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${.OBJDIR} NOMAN= true -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .if defined(ENABLE_SUID_K5SU) BINMODE=4555 diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile index 01566bb..329283b 100644 --- a/kerberos5/usr.bin/telnet/Makefile +++ b/kerberos5/usr.bin/telnet/Makefile @@ -17,8 +17,7 @@ DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \ ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} LDADD= -ltermcap ${LIBTELNET} -lmp \ - -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \ - -L${ROKENOBJDIR} -lroken \ + -lkrb5 -lasn1 -lcom_err -lroken \ -lcrypto -lcrypt -lipsec ${MINUSLPAM} .include diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index 21abed2..557e48f 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -12,12 +12,9 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${HDBOBJDIR} -lhdb \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kstash.8 diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index fd53f8b..5f2e5ee 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -25,16 +25,12 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KADM5COBJDIR} -lkadm5clnt \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \ - -lcrypto -lcrypt -lcom_err -lreadline -lcurses -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \ - ${LIBCURSES} +LDADD= -lkadm5clnt -lkrb5 -lroken ${LIBVERS} \ + ${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \ + -lreadline -lcurses +DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBREADLINE} ${LIBCURSES} MAN= ktutil.8 .include -- cgit v1.1