Fixed "make checkdpadd".

OK'ed by:	markm
This commit is contained in:
Ruslan Ermilov 2003-07-02 23:46:39 +00:00
parent 55c90a95a4
commit ea51b8e82b
18 changed files with 58 additions and 130 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <bsd.prog.mk>

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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 <bsd.prog.mk>