Style/consistency cleanup:

* libcrypto & libz are provided by ../Makefile.inc
* <bsd.own.mk> isn't required by most of these
* be consistent in the layout
This commit is contained in:
lukem 2005-01-03 06:05:50 +00:00
parent ecfeee924b
commit 4d41fe6044
10 changed files with 18 additions and 67 deletions

View File

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.3 2001/03/19 20:03:24 itojun Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile,v 1.4 2005/01/03 06:05:50 lukem Exp $
PROG= scp
SRCS= scp.c

View File

@ -1,15 +1,9 @@
# $NetBSD: Makefile,v 1.3 2001/03/19 20:03:25 itojun Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile,v 1.4 2005/01/03 06:05:50 lukem Exp $
PROG= sftp-server
SRCS= sftp-server.c sftp-common.c
MAN= sftp-server.8
BINDIR= /usr/libexec
SRCS= sftp-server.c sftp-common.c
.include <bsd.prog.mk>
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}

View File

@ -1,16 +1,9 @@
# $NetBSD: Makefile,v 1.6 2002/09/18 13:50:52 lukem Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile,v 1.7 2005/01/03 06:05:50 lukem Exp $
PROG= sftp
BINDIR= /usr/bin
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c misc.c
MAN= sftp.1
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c misc.c
BINDIR= /usr/bin
.include <bsd.prog.mk>
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}

View File

@ -1,12 +1,6 @@
# $NetBSD: Makefile,v 1.2 2001/03/19 20:03:25 itojun Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile,v 1.3 2005/01/03 06:05:50 lukem Exp $
PROG= ssh-add
SRCS= ssh-add.c
.include <bsd.prog.mk>
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}

View File

@ -1,12 +1,6 @@
# $NetBSD: Makefile,v 1.2 2001/03/19 20:03:25 itojun Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile,v 1.3 2005/01/03 06:05:50 lukem Exp $
PROG= ssh-agent
SRCS= ssh-agent.c
.include <bsd.prog.mk>
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}

View File

@ -1,12 +1,6 @@
# $NetBSD: Makefile,v 1.2 2001/03/19 20:03:26 itojun Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile,v 1.3 2005/01/03 06:05:50 lukem Exp $
PROG= ssh-keygen
SRCS= ssh-keygen.c
.include <bsd.prog.mk>
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}

View File

@ -1,14 +1,7 @@
# $NetBSD: Makefile,v 1.4 2002/06/24 06:11:12 itojun Exp $
.include <bsd.own.mk>
# $NetBSD: Makefile,v 1.5 2005/01/03 06:05:50 lukem Exp $
PROG= ssh-keyscan
SRCS= ssh-keyscan.c
MAN= ssh-keyscan.1
.include <bsd.prog.mk>
LDADD+= -lcrypto -lz
DPADD+= ${LIBCRYPTO} ${LIBZ}

View File

@ -1,18 +1,13 @@
# $NetBSD: Makefile,v 1.6 2002/07/03 14:23:49 itojun Exp $
# $NetBSD: Makefile,v 1.7 2005/01/03 06:05:51 lukem Exp $
.include <bsd.own.mk>
PROG= ssh-keysign
SRCS= ssh-keysign.c readconf.c
MAN= ssh-keysign.8
BINOWN= root
BINMODE=4555
BINDIR= /usr/libexec
MAN= ssh-keysign.8
.include <bsd.prog.mk>
LDADD+= -lcrypto -lz
DPADD+= ${LIBCRYPTO} ${LIBZ}

View File

@ -1,16 +1,15 @@
# $NetBSD: Makefile,v 1.18 2003/12/11 09:46:27 dyoung Exp $
# $NetBSD: Makefile,v 1.19 2005/01/03 06:05:50 lukem Exp $
.include <bsd.own.mk>
PROG= ssh
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
sshconnect.c sshconnect1.c sshconnect2.c
LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
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
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-I${DESTDIR}/usr/include/kerberosIV
CPPFLAGS+=-DKRB5 -DAFS -I${DESTDIR}/usr/include/krb5
@ -28,6 +27,3 @@ DPADD+= ${LIBCOM_ERR} ${LIBROKEN}
.endif
.include <bsd.prog.mk>
LDADD+= -lz -lcrypto
DPADD+= ${LIBZ} ${LIBCRYPTO}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 2003/12/11 09:46:27 dyoung Exp $
# $NetBSD: Makefile,v 1.21 2005/01/03 06:05:51 lukem Exp $
.include <bsd.own.mk>
@ -38,8 +38,8 @@ DPADD+= ${LIBCOM_ERR} ${LIBROKEN}
CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
LDADD+= -lcrypt -lcrypto -lutil -lz
DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
LDADD+= -lcrypt -lutil
DPADD+= ${LIBCRYPT} ${LIBUTIL}
CPPFLAGS+=-DLIBWRAP
LDADD+= -lwrap