diff options
author | ru <ru@FreeBSD.org> | 2003-07-02 23:46:39 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2003-07-02 23:46:39 +0000 |
commit | 495eff2a20335a0938b00911310ea73a967429a7 (patch) | |
tree | f6df80569df36a82ecf1ee3bbf93e0a7ba2f929a /kerberos5/usr.bin | |
parent | c8976315a3648e10b259958e291b475959c35ba6 (diff) | |
download | FreeBSD-src-495eff2a20335a0938b00911310ea73a967429a7.zip FreeBSD-src-495eff2a20335a0938b00911310ea73a967429a7.tar.gz |
Fixed "make checkdpadd".
OK'ed by: markm
Diffstat (limited to 'kerberos5/usr.bin')
-rw-r--r-- | kerberos5/usr.bin/kadmin/Makefile | 17 | ||||
-rw-r--r-- | kerberos5/usr.bin/kdestroy/Makefile | 8 | ||||
-rw-r--r-- | kerberos5/usr.bin/kinit/Makefile | 8 | ||||
-rw-r--r-- | kerberos5/usr.bin/klist/Makefile | 8 | ||||
-rw-r--r-- | kerberos5/usr.bin/kpasswd/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/usr.bin/ksu/Makefile | 8 | ||||
-rw-r--r-- | kerberos5/usr.bin/telnet/Makefile | 3 |
7 files changed, 23 insertions, 36 deletions
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 <bsd.prog.mk> 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 <bsd.prog.mk> 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 <bsd.prog.mk> 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 <bsd.prog.mk> 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 <bsd.prog.mk> |