d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make libssh an INTERNALLIB like it is in {Net,Open}BSD.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2005-06-06 16:13:07 +00:00
parent 463d4f5093
commit 32f80c77d0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=147056
11 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
secure/lib/libssh/Makefile
View File

@ -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

4
secure/libexec/sftp-server/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/libexec/ssh-keysign/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/scp/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/sftp/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-add/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-agent/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-keygen/Makefile
View File

@ -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 <bsd.prog.mk>

4
secure/usr.bin/ssh-keyscan/Makefile
View File

@ -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 <bsd.prog.mk>

8
secure/usr.bin/ssh/Makefile
View File

@ -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

10
secure/usr.sbin/sshd/Makefile
View File

@ -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