aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2025-07-24 04:57:26 +0000
committerCy Schubert <cy@FreeBSD.org>2025-07-24 16:31:39 +0000
commit188138106b9feb05bc2e51329295e41adbc95175 (patch)
treecdf8bfdf1ae26f4bece7d911927f64e747884a82
parent15c991fd64b79d8c7ba0ac20fa713a4102d60c1e (diff)
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
-rw-r--r--krb5/lib/crypto/Makefile4
-rw-r--r--krb5/lib/krb5/error_tables/Makefile.inc2
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}