diff options
| author | mrg <mrg@NetBSD.org> | 2018-02-25 00:16:48 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2018-02-25 00:16:48 +0000 |
| commit | 7e199baa49bce17e1ae7ac534b0e5968c968285e (patch) | |
| tree | ea1b2653990263e31b29e914cca7db7a02a57a37 /libexec | |
| parent | 4b67ccb9063c9583c5f43299b8349f3636bd27a8 (diff) | |
add LIBKRB5_LDADD/LIBKRB5_DPADD and their static counterparts
to bsd.prog.mk. use them instead of hard coding various lists
of libraries for krb5.
this fixes static builds.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/Makefile | 9 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 6520165425d..a067fbad1d7 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2015/01/25 15:53:49 christos Exp $ +# $NetBSD: Makefile,v 1.65 2018/02/25 00:16:48 mrg Exp $ # @(#)Makefile 8.2 (Berkeley) 4/4/94 .include <bsd.own.mk> @@ -47,11 +47,8 @@ ftpd.o ftpcmd.o: version.h # #SRCS+= k5login.c #CPPFLAGS+=-DKERBEROS5 -#DPADD+= ${LIBKRB5} ${LIBASN1} -#LDADD+= -lkrb5 -lasn1 -# -#DPADD+= ${LIBCRYPTO} ${{LIBCRYPT} ${LIBROKEN} ${LIBCOM_ERR} -#LDADD+= -lcrypto -lcrypt -lroken -lcom_err +#LDADD+= ${LIBKRB5_LDADD} +#DPADD+= ${LIBKRB5_DPADD} # #.endif diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 0e460aa93b8..beca9ac6aaf 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2018/02/10 19:34:34 christos Exp $ +# $NetBSD: Makefile,v 1.53 2018/02/25 00:16:48 mrg Exp $ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 WARNS?= 4 # XXX: const issues in sys_term.c @@ -22,8 +22,8 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR} .if (${USE_KERBEROS} != "no") CPPFLAGS+=-DKRB5 -LDADD+= -lkrb5 -lasn1 -lcom_err -lroken -lsqlite3 -DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3} +LDADD+= ${LIBKRB5_LDADD} +DPADD+= ${LIBKRB5_DPADD} .endif CPPFLAGS+=-DAUTHENTICATION -DENCRYPTION @@ -32,7 +32,7 @@ DPADD+=${LIBDES} ${LIBCRYPTO} ${LIBCRYPT} .if (${USE_PAM} != "no") LDADD+= -lpam ${PAM_STATIC_LDADD} -DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD} +DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD} .endif .include <bsd.prog.mk> |
