From 222e6cad0daf2279f25fe0760b4438a96cf4efbe Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 29 Jun 2022 15:06:18 +0000 Subject: [PATCH] Use relative paths so beck can run regress in his git tree and have the correct ssl_local.h etc be picked up. --- regress/lib/libssl/bytestring/Makefile | 5 +++-- regress/lib/libssl/handshake/Makefile | 5 +++-- regress/lib/libssl/key_schedule/Makefile | 5 +++-- regress/lib/libssl/tlsext/Makefile | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/regress/lib/libssl/bytestring/Makefile b/regress/lib/libssl/bytestring/Makefile index 162c81d255b..91b3fea9028 100644 --- a/regress/lib/libssl/bytestring/Makefile +++ b/regress/lib/libssl/bytestring/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2016/11/04 17:51:54 guenther Exp $ +# $OpenBSD: Makefile,v 1.6 2022/06/29 15:06:18 tb Exp $ PROG= bytestringtest LDADD= ${SSL_INT} -lcrypto DPADD= ${LIBCRYPTO} ${LIBSSL} WARNINGS= Yes -CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl +CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror +CFLAGS+= -I${.CURDIR}/../../../../lib/libssl .include diff --git a/regress/lib/libssl/handshake/Makefile b/regress/lib/libssl/handshake/Makefile index aa0f70bd3b4..64bd5709a84 100644 --- a/regress/lib/libssl/handshake/Makefile +++ b/regress/lib/libssl/handshake/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $ +# $OpenBSD: Makefile,v 1.9 2022/06/29 15:06:18 tb Exp $ PROGS += handshake_table PROGS += valid_handshakes_terminate @@ -10,7 +10,8 @@ REGRESS_TARGETS += run-$p LDADD = ${SSL_INT} -lcrypto DPADD = ${LIBCRYPTO} ${LIBSSL} WARNINGS = Yes -CFLAGS += -DLIBRESSL_INTERNAL -Wundef -Werror -I${BSDSRCDIR}/lib/libssl +CFLAGS += -DLIBRESSL_INTERNAL -Wundef -Werror +CFLAGS+= -I${.CURDIR}/../../../../lib/libssl print: handshake_table @./handshake_table -C diff --git a/regress/lib/libssl/key_schedule/Makefile b/regress/lib/libssl/key_schedule/Makefile index 24e12b7c36f..a8f23a27c5b 100644 --- a/regress/lib/libssl/key_schedule/Makefile +++ b/regress/lib/libssl/key_schedule/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2018/11/07 19:43:12 beck Exp $ +# $OpenBSD: Makefile,v 1.2 2022/06/29 15:06:18 tb Exp $ PROG= key_schedule LDADD= ${SSL_INT} -lcrypto DPADD= ${LIBCRYPTO} ${LIBSSL} WARNINGS= Yes -CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl +CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror +CFLAGS+= -I${.CURDIR}/../../../../lib/libssl .include diff --git a/regress/lib/libssl/tlsext/Makefile b/regress/lib/libssl/tlsext/Makefile index 48b5bc1e258..9ff441697fd 100644 --- a/regress/lib/libssl/tlsext/Makefile +++ b/regress/lib/libssl/tlsext/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2017/07/16 18:18:10 jsing Exp $ +# $OpenBSD: Makefile,v 1.2 2022/06/29 15:06:18 tb Exp $ PROG= tlsexttest LDADD= ${SSL_INT} -lcrypto DPADD= ${LIBCRYPTO} ${LIBSSL} WARNINGS= Yes -CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl +CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror +CFLAGS+= -I${.CURDIR}/../../../../lib/libssl .include -- 2.20.1