mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-01-04 00:32:06 +00:00
Resync Makefile.inc with upstream.
It's unused in -portable, but having it out of sync makes other syncs fail to apply.
This commit is contained in:
parent
928f1231f6
commit
c1941293d9
@ -1,8 +1,20 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.12 2017/12/21 00:41:22 djm Exp $
|
||||
|
||||
REGRESS_FAIL_EARLY?= yes
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.obj.mk>
|
||||
|
||||
MALLOC_OPTIONS?= CFGJRSUX
|
||||
TEST_ENV?= MALLOC_OPTIONS=${MALLOC_OPTIONS}
|
||||
|
||||
# XXX detect from ssh binary?
|
||||
OPENSSL?= yes
|
||||
|
||||
.if (${OPENSSL:L} == "yes")
|
||||
CFLAGS+= -DWITH_OPENSSL
|
||||
.endif
|
||||
|
||||
# enable warnings
|
||||
WARNINGS=Yes
|
||||
|
||||
@ -49,5 +61,10 @@ DPADD+=${.CURDIR}/../test_helper/libtest_helper.a
|
||||
|
||||
.PATH: ${.CURDIR}/${SSHREL}
|
||||
|
||||
LDADD+= -lutil
|
||||
DPADD+= ${LIBUTIL}
|
||||
|
||||
.if (${OPENSSL:L} == "yes")
|
||||
LDADD+= -lcrypto
|
||||
DPADD+= ${LIBCRYPTO}
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user