From a89169ef053777f28e5e3f84b028bb3ab9fd0b94 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Mon, 14 Sep 2026 12:29:53 -0700 Subject: [PATCH] Include SPDM, PQC, test and CMake files in the source distribution --- cmake/include.am | 1 + examples/pqc/include.am | 8 +++++--- src/spdm/include.am | 6 ++++-- tests/include.am | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cmake/include.am b/cmake/include.am index ceec20a6..b5cc67ad 100644 --- a/cmake/include.am +++ b/cmake/include.am @@ -1,2 +1,3 @@ EXTRA_DIST += cmake/README.md EXTRA_DIST += cmake/config.in +EXTRA_DIST += cmake/wolftpm-config.cmake.in diff --git a/examples/pqc/include.am b/examples/pqc/include.am index 8f2b9ea5..3b79085e 100644 --- a/examples/pqc/include.am +++ b/examples/pqc/include.am @@ -39,8 +39,10 @@ examples_pqc_pqc_ctrl_SOURCES = examples/pqc/pqc_ctrl.c examples_pqc_pqc_ctrl_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_pqc_pqc_ctrl_DEPENDENCIES = src/libwolftpm.la +endif +endif + +# Ship unconditionally so these are not dropped from a tarball packaged without +# PQC enabled (EXTRA_DIST inside a conditional is excluded from dist otherwise). EXTRA_DIST += examples/pqc/README.md EXTRA_DIST += examples/pqc/pqc_ctrl.sh - -endif -endif diff --git a/src/spdm/include.am b/src/spdm/include.am index 2e7ed2e2..f6838fd8 100644 --- a/src/spdm/include.am +++ b/src/spdm/include.am @@ -41,7 +41,9 @@ src_spdm_unit_test_SOURCES = src/spdm/unit_test.c src_spdm_unit_test_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) src_spdm_unit_test_CFLAGS = $(AM_CFLAGS) +endif BUILD_SPDM + +# Ship unconditionally: EXTRA_DIST inside a conditional is dropped from the dist +# tarball when packaged without --enable-spdm, breaking later --enable-spdm builds. EXTRA_DIST += src/spdm/spdm_internal.h EXTRA_DIST += src/spdm/README.md - -endif BUILD_SPDM diff --git a/tests/include.am b/tests/include.am index 3d352b0e..50597edc 100644 --- a/tests/include.am +++ b/tests/include.am @@ -54,3 +54,5 @@ if BUILD_FWTPM dist_noinst_SCRIPTS += tests/fwtpm_check.sh \ tests/fwtpm_da_retry.sh endif + +EXTRA_DIST += tests/pqc_kat_vectors.h