From 6ea5ed6d7a4b4ffc84eeac2b3c15a7a696e9a89e Mon Sep 17 00:00:00 2001 From: des Date: Mon, 6 Jun 2005 16:13:07 +0000 Subject: Make libssh an INTERNALLIB like it is in {Net,Open}BSD. --- secure/lib/libssh/Makefile | 8 ++------ secure/libexec/sftp-server/Makefile | 4 +++- secure/libexec/ssh-keysign/Makefile | 4 +++- secure/usr.bin/scp/Makefile | 4 +++- secure/usr.bin/sftp/Makefile | 4 +++- secure/usr.bin/ssh-add/Makefile | 4 +++- secure/usr.bin/ssh-agent/Makefile | 4 +++- secure/usr.bin/ssh-keygen/Makefile | 4 +++- secure/usr.bin/ssh-keyscan/Makefile | 4 +++- secure/usr.bin/ssh/Makefile | 8 ++++---- secure/usr.sbin/sshd/Makefile | 10 ++++------ 11 files changed, 34 insertions(+), 24 deletions(-) (limited to 'secure') diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index b290c86..947a438 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ +INTERNALLIB= LIB= ssh -SHLIB_MAJOR= 2 SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \ canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \ cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \ @@ -11,11 +11,7 @@ SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \ atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \ monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \ kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \ - entropy.c scard-opensc.c - -# gss-genr.c should be in $SRCS but causes linking problems, so it is -# compiled directly into sshd instead. - + entropy.c scard-opensc.c gss-genr.c # Portability layer SRCS+= bsd-closefrom.c bsd-misc.c getrrsetbyname.c vis.c xcrypt.c xmmap.c # FreeBSD additions diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 28cff68..ff1d4b1 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -1,12 +1,14 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= sftp-server SRCS= sftp-server.c sftp-common.c MAN= sftp-server.8 CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 3f2ed51..24bf29e 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-keysign SRCS= ssh-keysign.c readconf.c MAN= ssh-keysign.8 @@ -9,7 +11,7 @@ BINMODE=4511 .endif DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index d6d5aba..f0512e9 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= scp CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 08512e8..1af7d82 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,11 +1,13 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= sftp SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} -LDADD= -lssh -lcrypt -lcrypto -lz -ledit +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz -ledit .include diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 2716a62..5d091c2 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-add CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 2f88a6d..9aa2084 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-agent CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 5dc8699..b8a4cc1 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-keygen CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 1c5ab3e..f4f59ed 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a + PROG= ssh-keyscan CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +LDADD= ${LIBSSH} -lcrypt -lcrypto -lz .include diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 274e481..403ee76 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ -# + +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a PROG= ssh CFLAGS+=-I${SSHDIR} @@ -8,11 +9,10 @@ MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 SRCS= ssh.c readconf.c clientloop.c sshtty.c \ - sshconnect.c sshconnect1.c sshconnect2.c \ - gss-genr.c + sshconnect.c sshconnect1.c sshconnect2.c DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} -LDADD= -lssh -lutil -lz +LDADD= ${LIBSSH} -lutil -lz .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 4e73571..fef808b 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ -# + +LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ @@ -12,16 +13,13 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ auth-krb5.c \ auth2-gss.c gss-serv.c gss-serv-krb5.c \ loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \ - audit.c audit-bsm.c \ - gss-genr.c - -# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile + audit.c audit-bsm.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} -LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM} +LDADD= ${LIBSSH} -lutil -lz -lwrap ${MINUSLPAM} .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL -- cgit v1.1