The branch main has been updated by cy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=188138106b9feb05bc2e51329295e41adbc95175
commit 188138106b9feb05bc2e51329295e41adbc95175
Author: Cy Schubert <c...@freebsd.org>
AuthorDate: 2025-07-24 04:57:26 +0000
Commit: Cy Schubert <c...@freebsd.org>
CommitDate: 2025-07-24 16:31:39 +0000
krb5: Remove a duplicate include of error_tables/Makefile.inc
And move the aggregation of its generated sources to the correct
library, libkrb5.so.
Fixes: ee3960cba106
---
krb5/lib/crypto/Makefile | 4 ----
krb5/lib/krb5/error_tables/Makefile.inc | 2 ++
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/krb5/lib/crypto/Makefile b/krb5/lib/crypto/Makefile
index ed1cd7764012..4dda0d85da54 100644
--- a/krb5/lib/crypto/Makefile
+++ b/krb5/lib/crypto/Makefile
@@ -23,10 +23,6 @@ VERSION_MAP= ${.CURDIR}/version.map
# .include "${KRB5_CRYPTOLIBDIR}/builtin/Makefile.inc"
# .include "${KRB5_CRYPTOLIBDIR}/openssl/Makefile.inc"
-.include "${KRB5_SRCTOP}/lib/krb5/error_tables/Makefile.inc"
-
-SRCS+= ${GEN_ET}
-
.include "${KRB5_SRCTOP}/lib/crypto/krb/Makefile.inc"
.include "${KRB5_SRCTOP}/lib/crypto/builtin/Makefile.inc"
.include "${KRB5_SRCTOP}/lib/crypto/openssl/Makefile.inc"
diff --git a/krb5/lib/krb5/error_tables/Makefile.inc
b/krb5/lib/krb5/error_tables/Makefile.inc
index dee259798dae..5d2ec3b9e920 100644
--- a/krb5/lib/krb5/error_tables/Makefile.inc
+++ b/krb5/lib/krb5/error_tables/Makefile.inc
@@ -144,3 +144,5 @@ ${GEN_ASN1_ERR_C}: ${GEN_ASN1_ERR}
${COMPILE_ET} et-c-${.PREFIX}.et
mv et-c-${.PREFIX}.c ${.PREFIX}.c
rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c
+
+SRCS+= ${GEN_ET}
