diff options
author | bapt <bapt@FreeBSD.org> | 2014-11-25 21:18:18 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2014-11-25 21:18:18 +0000 |
commit | 1f187793183f3d481e685f06b9d0776d38926bf7 (patch) | |
tree | 569e9832fa3d4775e3b8244ea1f09d4307418368 /secure/usr.sbin | |
parent | 84381fd9772c40ffd0f864ffb6db9a6f89e54fe0 (diff) | |
download | FreeBSD-src-1f187793183f3d481e685f06b9d0776d38926bf7.zip FreeBSD-src-1f187793183f3d481e685f06b9d0776d38926bf7.tar.gz |
Convert to LIBADD
Reduce overlinking
Diffstat (limited to 'secure/usr.sbin')
-rw-r--r-- | secure/usr.sbin/sshd/Makefile | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 7215315..f95c8c6 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -25,9 +25,7 @@ SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} -LDADD= ${LDSSH} -lutil -lwrap ${MINUSLPAM} -USEPRIVATELIB= ssh +LIBADD= ssh util wrap pam .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -38,33 +36,29 @@ CFLAGS+= -DHAVE_LDNS=1 .if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR -DPADD+= ${LIBBSM} -LDADD+= -lbsm +LIBADD+= bsm .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ - ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} -LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ - -lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC} +LIBADD+= gssapi_krb5 gssapi krb5 hx509 asn1 com_err roken wind heimbase \ + heimipcc .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z # Fix the order of NEEDED entries for libthr and libc. The libthr # needs to interpose libc symbols, leaving the libthr loading as # dependency of krb causes reversed order and broken interposing. Put # the threading library last on the linker command line, just before # the -lc added by a compiler driver. +# XXX In theory the framework now takes care of that, it needs to be checked .if ${MK_KERBEROS_SUPPORT} != "no" -DPADD+= ${LIBPTHREAD} -LDADD+= -lpthread +LIBADD+= pthread .endif .if defined(LOCALBASE) |