diff options
Diffstat (limited to 'regress/unittests/Makefile.inc')
-rw-r--r-- | regress/unittests/Makefile.inc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc index 36d1ff42c..b509f4452 100644 --- a/regress/unittests/Makefile.inc +++ b/regress/unittests/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.11 2017/04/30 23:33:48 djm Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.12 2017/12/21 00:41:22 djm Exp $ |
2 | 2 | ||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> |
4 | .include <bsd.obj.mk> | 4 | .include <bsd.obj.mk> |
@@ -30,8 +30,8 @@ CDIAGFLAGS+= -Wswitch | |||
30 | CDIAGFLAGS+= -Wtrigraphs | 30 | CDIAGFLAGS+= -Wtrigraphs |
31 | CDIAGFLAGS+= -Wuninitialized | 31 | CDIAGFLAGS+= -Wuninitialized |
32 | CDIAGFLAGS+= -Wunused | 32 | CDIAGFLAGS+= -Wunused |
33 | CDIAGFLAGS+= -Wno-unused-parameter | ||
33 | .if ${COMPILER_VERSION:L} != "gcc3" | 34 | .if ${COMPILER_VERSION:L} != "gcc3" |
34 | CDIAGFLAGS+= -Wpointer-sign | ||
35 | CDIAGFLAGS+= -Wold-style-definition | 35 | CDIAGFLAGS+= -Wold-style-definition |
36 | .endif | 36 | .endif |
37 | 37 | ||
@@ -47,17 +47,7 @@ LDADD+=-L${.CURDIR}/../test_helper -ltest_helper | |||
47 | DPADD+=${.CURDIR}/../test_helper/libtest_helper.a | 47 | DPADD+=${.CURDIR}/../test_helper/libtest_helper.a |
48 | .endif | 48 | .endif |
49 | 49 | ||
50 | .if exists(${.CURDIR}/${SSHREL}/lib/${__objdir}) | 50 | .PATH: ${.CURDIR}/${SSHREL} |
51 | LDADD+=-L${.CURDIR}/${SSHREL}/lib/${__objdir} -lssh | ||
52 | LIBSSH=${.CURDIR}/${SSHREL}/lib/${__objdir}/libssh.a | ||
53 | .else | ||
54 | LDADD+=-L${.CURDIR}/${SSHREL}/lib -lssh | ||
55 | LIBSSH=${.CURDIR}/${SSHREL}/lib/libssh.a | ||
56 | .endif | ||
57 | DPADD+=${LIBSSH} | ||
58 | ${PROG}: ${LIBSSH} | ||
59 | ${LIBSSH}: | ||
60 | cd ${.CURDIR}/${SSHREL} && ${MAKE} lib | ||
61 | 51 | ||
62 | LDADD+= -lcrypto | 52 | LDADD+= -lcrypto |
63 | DPADD+= ${LIBCRYPTO} | 53 | DPADD+= ${LIBCRYPTO} |