tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

Add a makefile rule to create the ssh library when
regress needs it.  This allows to run the ssh regression tests without doing
a "make build" before. Discussed with dtucker@ and djm@; OK djm@

Upstream-Regress-ID: ce489bd53afcd471225a125b4b94565d4717c025
This commit is contained in:
bluhm@openbsd.org 2016-09-28 20:09:52 +00:00 committed by Damien Miller
parent ce44c970f9
commit ca71c36645
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
regress/unittests/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.6 2015/07/01 23:11:18 djm Exp $ # $OpenBSD: Makefile.inc,v 1.7 2016/09/28 20:09:52 bluhm Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include <bsd.obj.mk> .include <bsd.obj.mk>
@ -49,11 +49,15 @@ DPADD+=${.CURDIR}/../test_helper/libtest_helper.a
.if exists(${.CURDIR}/${SSHREL}/lib/${__objdir}) .if exists(${.CURDIR}/${SSHREL}/lib/${__objdir})
LDADD+=-L${.CURDIR}/${SSHREL}/lib/${__objdir} -lssh LDADD+=-L${.CURDIR}/${SSHREL}/lib/${__objdir} -lssh
DPADD+=${.CURDIR}/${SSHREL}/lib/${__objdir}/libssh.a LIBSSH=${.CURDIR}/${SSHREL}/lib/${__objdir}/libssh.a
.else .else
LDADD+=-L${.CURDIR}/${SSHREL}/lib -lssh LDADD+=-L${.CURDIR}/${SSHREL}/lib -lssh
DPADD+=${.CURDIR}/${SSHREL}/lib/libssh.a LIBSSH=${.CURDIR}/${SSHREL}/lib/libssh.a
.endif .endif
DPADD+=${LIBSSH}
${PROG}: ${LIBSSH}
${LIBSSH}:
cd ${.CURDIR}/${SSHREL} && ${MAKE} lib
LDADD+= -lcrypto LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO} DPADD+= ${LIBCRYPTO}