diff options
| author | gordon <gordon@FreeBSD.org> | 2003-08-19 07:45:03 +0000 |
|---|---|---|
| committer | gordon <gordon@FreeBSD.org> | 2003-08-19 07:45:03 +0000 |
| commit | 7166b89595c332e02c04e1d367bbd0b33e42b233 (patch) | |
| tree | c28e9c9d142adf809043f102443528dfe3b32da6 /secure | |
| parent | eba4ad609e4ee4e9f6633ab5db2c88b43fba56d7 (diff) | |
| download | FreeBSD-src-7166b89595c332e02c04e1d367bbd0b33e42b233.zip FreeBSD-src-7166b89595c332e02c04e1d367bbd0b33e42b233.tar.gz | |
Explicitly add libz and libcrypto to LDADD for any ssh utilities missing
it. While not strictly required, it unbreaks the cross-build world that
is resulting from moving the libraries around.
I have a more permanent solution to this problem in the works, but I
asked des for permission to commit this to get the ball rolling. This
also makes the ssh build more along the lines of what the openssh-portable
and OpenBSD openssh Makefile glue does.
Reviewed by: des
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/libexec/sftp-server/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/scp/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/sftp/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index e37f8f5..8f80230 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -5,8 +5,8 @@ SRCS= sftp-common.c sftp-server.c MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} -DPADD+= ${LIBSSH} ${LIBCRYPTO} -LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 03f3316..33c2c75 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -3,8 +3,8 @@ PROG= scp CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} -LDADD= -lssh +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 32fa7cd..87f7694 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -4,8 +4,8 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index ab4a2b4..a970d28 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -3,8 +3,8 @@ PROG= ssh-add CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 0fbd96d..8d1331a 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -3,8 +3,8 @@ PROG= ssh-agent CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 8140cde..f2f1a21 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -3,8 +3,8 @@ PROG= ssh-keygen CFLAGS+=-I${SSHDIR} -DPADD= ${LIBSSH} ${LIBCRYPTO} -LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include <bsd.prog.mk> |
