diff --git a/examples/attestation/include.am b/examples/attestation/include.am index cfd121a..6d28907 100644 --- a/examples/attestation/include.am +++ b/examples/attestation/include.am @@ -20,9 +20,10 @@ examples_attestation_activate_credential_LDADD = src/libwolftpm.la $(LIB_ examples_attestation_activate_credential_DEPENDENCIES = src/libwolftpm.la endif - -dist_example_DATA+= examples/attestation/make_credential.c \ - examples/attestation/activate_credential.c +example_attestationdir = $(exampledir)/attestation +dist_example_attestation_DATA = \ + examples/attestation/make_credential.c \ + examples/attestation/activate_credential.c DISTCLEANFILES+= examples/attestation/.libs/make_credential \ examples/attestation/.libs/activate_credential diff --git a/examples/bench/include.am b/examples/bench/include.am index 89d3d3f..d762f27 100644 --- a/examples/bench/include.am +++ b/examples/bench/include.am @@ -11,5 +11,7 @@ examples_bench_bench_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_bench_bench_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/bench/bench.c +example_benchdir = $(exampledir)/bench +dist_example_bench_DATA = examples/bench/bench.c + DISTCLEANFILES+= examples/bench/.libs/bench diff --git a/examples/csr/include.am b/examples/csr/include.am index a47da3a..649aac0 100644 --- a/examples/csr/include.am +++ b/examples/csr/include.am @@ -11,5 +11,7 @@ examples_csr_csr_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_csr_csr_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/csr/csr.c +example_csrdir = $(exampledir)/csr +dist_example_csr_DATA = examples/csr/csr.c + DISTCLEANFILES+= examples/csr/.libs/csr diff --git a/examples/gpio/include.am b/examples/gpio/include.am index 6767459..06fdd6e 100644 --- a/examples/gpio/include.am +++ b/examples/gpio/include.am @@ -24,10 +24,11 @@ examples_gpio_gpio_set_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_gpio_gpio_set_DEPENDENCIES = src/libwolftpm.la endif - -dist_example_DATA+= examples/gpio/gpio_config.c -dist_example_DATA+= examples/gpio/gpio_read.c -dist_example_DATA+= examples/gpio/gpio_set.c +example_gpiodir = $(exampledir)/gpio +dist_example_gpio_DATA = \ + examples/gpio/gpio_config.c \ + examples/gpio/gpio_read.c \ + examples/gpio/gpio_set.c DISTCLEANFILES+= examples/gpio/.libs/gpio_config DISTCLEANFILES+= examples/gpio/.libs/gpio_read diff --git a/examples/keygen/include.am b/examples/keygen/include.am index ec326d7..fe84c08 100644 --- a/examples/keygen/include.am +++ b/examples/keygen/include.am @@ -26,9 +26,12 @@ examples_keygen_keyimport_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_keygen_keyimport_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/keygen/keyload.c -dist_example_DATA+= examples/keygen/keygen.c -dist_example_DATA+= examples/keygen/keyimport.c +example_keygendir = $(exampledir)/keygen +dist_example_keygen_DATA = \ + examples/keygen/keyload.c \ + examples/keygen/keygen.c \ + examples/keygen/keyimport.c + DISTCLEANFILES+= examples/keygen/.libs/keyload DISTCLEANFILES+= examples/keygen/.libs/keygen DISTCLEANFILES+= examples/keygen/.libs/keyimport diff --git a/examples/management/include.am b/examples/management/include.am index 278971d..edf8fba 100644 --- a/examples/management/include.am +++ b/examples/management/include.am @@ -12,6 +12,7 @@ examples_management_flush_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_management_flush_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/management/flush.c +example_managementdir = $(exampledir)/management +dist_example_management_DATA = examples/management/flush.c DISTCLEANFILES+= examples/management/.libs/flush diff --git a/examples/native/include.am b/examples/native/include.am index b940993..728083d 100644 --- a/examples/native/include.am +++ b/examples/native/include.am @@ -10,5 +10,7 @@ examples_native_native_test_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_native_native_test_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/native/native_test.c +example_nativedir = $(exampledir)/native +dist_example_native_DATA = examples/native/native_test.c + DISTCLEANFILES+= examples/native/.libs/native_test diff --git a/examples/nvram/include.am b/examples/nvram/include.am index a0bb335..7de6dcd 100644 --- a/examples/nvram/include.am +++ b/examples/nvram/include.am @@ -20,7 +20,10 @@ examples_nvram_read_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/nvram/store.c -dist_example_DATA+= examples/nvram/read.c +example_nvramdir = $(exampledir)/nvram +dist_example_nvram_DATA = \ + examples/nvram/store.c \ + examples/nvram/read.c + DISTCLEANFILES+= examples/nvram/.libs/store DISTCLEANFILES+= examples/nvram/.libs/read diff --git a/examples/pcr/include.am b/examples/pcr/include.am index 58120e3..e847ff0 100644 --- a/examples/pcr/include.am +++ b/examples/pcr/include.am @@ -32,10 +32,12 @@ examples_pcr_reset_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_pcr_reset_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/pcr/quote.c \ - examples/pcr/read_pcr.c \ - examples/pcr/extend.c \ - examples/pcr/reset.c +example_pcrdir = $(exampledir)/pcr +dist_example_pcr_DATA = \ + examples/pcr/quote.c \ + examples/pcr/read_pcr.c \ + examples/pcr/extend.c \ + examples/pcr/reset.c DISTCLEANFILES+= examples/pcr/.libs/quote \ examples/pcr/.libs/read_pcr \ diff --git a/examples/pkcs7/include.am b/examples/pkcs7/include.am index 484e425..5ee3e9e 100644 --- a/examples/pkcs7/include.am +++ b/examples/pkcs7/include.am @@ -11,5 +11,7 @@ examples_pkcs7_pkcs7_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_pkcs7_pkcs7_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/pkcs7/pkcs7.c +example_pkcs7dir = $(exampledir)/pkcs7 +dist_example_pkcs7_DATA = examples/pkcs7/pkcs7.c + DISTCLEANFILES+= examples/pkcs7/.libs/pkcs7 diff --git a/examples/seal/include.am b/examples/seal/include.am index 3368796..e4f820d 100644 --- a/examples/seal/include.am +++ b/examples/seal/include.am @@ -20,8 +20,10 @@ examples_seal_unseal_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/seal/seal.c -dist_example_DATA+= examples/seal/unseal.c +example_sealdir = $(exampledir)/seal +dist_example_seal_DATA = \ + examples/seal/seal.c \ + examples/seal/unseal.c DISTCLEANFILES+= examples/seal/.libs/seal DISTCLEANFILES+= examples/seal/.libs/unseal diff --git a/examples/timestamp/include.am b/examples/timestamp/include.am index 056ea04..c314ca6 100644 --- a/examples/timestamp/include.am +++ b/examples/timestamp/include.am @@ -9,12 +9,8 @@ examples_timestamp_signed_timestamp_SOURCES = examples/timestamp/signed_tim examples/tpm_io.c examples_timestamp_signed_timestamp_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_timestamp_signed_timestamp_DEPENDENCIES = src/libwolftpm.la -endif -dist_example_DATA+= examples/timestamp/signed_timestamp.c -DISTCLEANFILES+= examples/timestamp/.libs/signed_timestamp -if BUILD_EXAMPLES noinst_PROGRAMS += examples/timestamp/clock_set noinst_HEADERS += examples/timestamp/clock_set.h examples_timestamp_clock_set_SOURCES = examples/timestamp/clock_set.c \ @@ -23,5 +19,10 @@ examples_timestamp_clock_set_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_timestamp_clock_set_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/timestamp/clock_set.c +example_timestampdir = $(exampledir)/timestamp +dist_example_timestamp_DATA = \ + examples/timestamp/clock_set.c \ + examples/timestamp/signed_timestamp.c + +DISTCLEANFILES+= examples/timestamp/.libs/signed_timestamp DISTCLEANFILES+= examples/timestamp/.libs/clock_set diff --git a/examples/tls/include.am b/examples/tls/include.am index b37e771..7d74cff 100644 --- a/examples/tls/include.am +++ b/examples/tls/include.am @@ -31,8 +31,10 @@ examples_tls_tls_server_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/tls/tls_client.c -DISTCLEANFILES+= examples/tls/.libs/tls_client +example_tlsdir = $(exampledir)/tls +dist_example_tls_DATA = \ + examples/tls/tls_client.c \ + examples/tls/tls_server.c -dist_example_DATA+= examples/tls/tls_server.c +DISTCLEANFILES+= examples/tls/.libs/tls_client DISTCLEANFILES+= examples/tls/.libs/tls_server diff --git a/examples/wrap/include.am b/examples/wrap/include.am index d5b621f..6953c74 100644 --- a/examples/wrap/include.am +++ b/examples/wrap/include.am @@ -10,5 +10,7 @@ examples_wrap_wrap_test_LDADD = src/libwolftpm.la $(LIB_STATIC_ADD) examples_wrap_wrap_test_DEPENDENCIES = src/libwolftpm.la endif -dist_example_DATA+= examples/wrap/wrap_test.c +example_wrapdir = $(exampledir)/wrap +dist_example_wrap_DATA = examples/wrap/wrap_test.c + DISTCLEANFILES+= examples/wrap/.libs/wrap_test