Skip to content

Commit ca71c36

Browse files
bluhmdjmdjm
authored andcommitted
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
1 parent ce44c97 commit ca71c36

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

regress/unittests/Makefile.inc

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $OpenBSD: Makefile.inc,v 1.6 2015/07/01 23:11:18 djm Exp $
1+
# $OpenBSD: Makefile.inc,v 1.7 2016/09/28 20:09:52 bluhm Exp $
22

33
.include <bsd.own.mk>
44
.include <bsd.obj.mk>
@@ -49,11 +49,15 @@ DPADD+=${.CURDIR}/../test_helper/libtest_helper.a
4949

5050
.if exists(${.CURDIR}/${SSHREL}/lib/${__objdir})
5151
LDADD+=-L${.CURDIR}/${SSHREL}/lib/${__objdir} -lssh
52-
DPADD+=${.CURDIR}/${SSHREL}/lib/${__objdir}/libssh.a
52+
LIBSSH=${.CURDIR}/${SSHREL}/lib/${__objdir}/libssh.a
5353
.else
5454
LDADD+=-L${.CURDIR}/${SSHREL}/lib -lssh
55-
DPADD+=${.CURDIR}/${SSHREL}/lib/libssh.a
55+
LIBSSH=${.CURDIR}/${SSHREL}/lib/libssh.a
5656
.endif
57+
DPADD+=${LIBSSH}
58+
${PROG}: ${LIBSSH}
59+
${LIBSSH}:
60+
cd ${.CURDIR}/${SSHREL} && ${MAKE} lib
5761

5862
LDADD+= -lcrypto
5963
DPADD+= ${LIBCRYPTO}

0 commit comments

Comments
 (0)