From 81bea703a54e6caef0d77e7d89f2aaa3855ac456 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Sat, 4 Dec 2021 16:29:25 +0000
Subject: [PATCH] List subdirectories as a simple list. Avoids a source of many
 merge conflicts in my work on making much of libcrypto opaque.

discussed with jsing
---
 lib/libcrypto/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index e4269272f8c..fbeb625c753 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2021/12/04 15:38:10 jsing Exp $
+# $OpenBSD: Makefile,v 1.53 2021/12/04 16:29:25 tb Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -28,13 +28,15 @@ CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN
 CFLAGS+= -DOPENSSL_NO_HW_PADLOCK # XXX enable this?
 
 CFLAGS+= -I${LCRYPTO_SRC}
-CFLAGS+= -I${LCRYPTO_SRC}/asn1 -I${LCRYPTO_SRC}/bn -I${LCRYPTO_SRC}/bytestring
-CFLAGS+= -I${LCRYPTO_SRC}/evp -I${LCRYPTO_SRC}/modes -I${LCRYPTO_SRC}/x509
-
-# XXX FIXME ecdsa and ec should be merged
-CFLAGS+= -I${LCRYPTO_SRC}/ecdsa
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+CFLAGS+= -I${LCRYPTO_SRC}/bytestring
+CFLAGS+= -I${LCRYPTO_SRC}/evp
 CFLAGS+= -I${LCRYPTO_SRC}/ec
 CFLAGS+= -I${LCRYPTO_SRC}/ecdh
+CFLAGS+= -I${LCRYPTO_SRC}/ecdsa
+CFLAGS+= -I${LCRYPTO_SRC}/modes
+CFLAGS+= -I${LCRYPTO_SRC}/x509
 
 VERSION_SCRIPT=	Symbols.map
 SYMBOL_LIST=	${.CURDIR}/Symbols.list
-- 
2.20.1