From 8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864 Mon Sep 17 00:00:00 2001 From: bapt Date: Wed, 6 Aug 2014 22:17:26 +0000 Subject: Rework privatelib/internallib Make sure everything linking to a privatelib and/or an internallib does it directly from the OBJDIR rather than DESTDIR. Add src.libnames.mk so bsd.libnames.mk is not polluted by libraries not existsing in final installation Introduce the LD* variable which is what ld(1) is expecting (via LDADD) to link to internal/privatelib Directly link to the .so in case of private library to avoid having to complexify LDFLAGS. Phabric: https://phabric.freebsd.org/D553 Reviewed by: imp, emaste --- secure/lib/libssh/Makefile | 2 +- secure/libexec/sftp-server/Makefile | 2 +- secure/libexec/ssh-keysign/Makefile | 2 +- secure/libexec/ssh-pkcs11-helper/Makefile | 2 +- secure/usr.bin/scp/Makefile | 2 +- secure/usr.bin/sftp/Makefile | 2 +- secure/usr.bin/ssh-add/Makefile | 2 +- secure/usr.bin/ssh-agent/Makefile | 2 +- secure/usr.bin/ssh-keygen/Makefile | 4 ++-- secure/usr.bin/ssh-keyscan/Makefile | 2 +- secure/usr.bin/ssh/Makefile | 4 ++-- secure/usr.sbin/sshd/Makefile | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) (limited to 'secure') diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index b63d6b9..36b4d76 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -35,7 +35,7 @@ LDNSDIR= ${.CURDIR}/../../../contrib/ldns CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} SRCS+= getrrsetbyname-ldns.c DPADD+= ${LIBLDNS} -LDADD+= -lldns +LDADD+= ${LDLDNS} USEPRIVATELIB+= ldns .endif diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index eb788f6..ebddba9 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -13,7 +13,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 668ad9e..f248666 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -9,7 +9,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h BINMODE=4555 DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index f3cf902..b73416f 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -13,7 +13,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index d58d855..1d77d4f 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index bb1c325..96f9d04 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} ${LIBEDIT} ${LIBNCURSESW} -LDADD= -lssh -ledit -lncursesw +LDADD= ${LDSSH} -ledit -lncursesw USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 97191ba..fe8739b 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index b5db532..b5c98b7 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 45e4d16..62e3927 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -12,13 +12,13 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 DPADD+= ${LIBLDNS} -LDADD+= -lldns +LDADD+= ${LDLDNS} USEPRIVATELIB+= ldns .endif diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 298f52a..4465918 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -7,7 +7,7 @@ SRCS= ssh-keyscan.c roaming_dummy.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 89f9927..bb23f43 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -16,13 +16,13 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ SRCS+= gss-genr.c DPADD= ${LIBSSH} ${LIBUTIL} -LDADD= -lssh -lutil +LDADD= ${LDSSH} -lutil USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 DPADD+= ${LIBLDNS} -LDADD+= -lldns +LDADD+= ${LIBLDNSADD} USEPRIVATELIB+= ldns .endif diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index d487fe3..7215315 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -26,7 +26,7 @@ MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} -LDADD= -lssh -lutil -lwrap ${MINUSLPAM} +LDADD= ${LDSSH} -lutil -lwrap ${MINUSLPAM} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" @@ -47,7 +47,7 @@ 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 -lheimipcc + -lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC} .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" -- cgit v1.1