From f932736f234fbd3146300851bf0452d49342c338 Mon Sep 17 00:00:00 2001 From: Maxime Vincent Date: Mon, 2 Aug 2021 16:44:07 +0200 Subject: [PATCH] Fix include.am / EXTRA_DIST --- IDE/include.am | 2 +- zephyr/include.am | 58 +++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/IDE/include.am b/IDE/include.am index 737d6dd3e..b25e4f34d 100644 --- a/IDE/include.am +++ b/IDE/include.am @@ -38,7 +38,7 @@ include IDE/XilinxSDK/include.am include IDE/VisualDSP/include.am include IDE/QNX/include.am include IDE/WINCE/include.am -#include IDE/zephyr/include.am +include zephyr/include.am EXTRA_DIST+= IDE/IAR-EWARM IDE/MDK-ARM IDE/MDK5-ARM IDE/MYSQL IDE/LPCXPRESSO IDE/HEXIWEAR IDE/Espressif EXTRA_DIST+= IDE/OPENSTM32/README.md diff --git a/zephyr/include.am b/zephyr/include.am index 8b72fa0e1..db4071490 100644 --- a/zephyr/include.am +++ b/zephyr/include.am @@ -2,33 +2,31 @@ # included from Top Level Makefile.am # All paths should be given relative to the root -EXTRA_DIST+= IDE/zephyr/lib/settings/user_settings-tls-generic.h -EXTRA_DIST+= IDE/zephyr/lib/zephyr/module.yml -EXTRA_DIST+= IDE/zephyr/lib/install_lib.sh -EXTRA_DIST+= IDE/zephyr/lib/README -EXTRA_DIST+= IDE/zephyr/lib/user_settings.h -EXTRA_DIST+= IDE/zephyr/module/CMakeLists.txt -EXTRA_DIST+= IDE/zephyr/module/install_module.sh -EXTRA_DIST+= IDE/zephyr/module/Kconfig -EXTRA_DIST+= IDE/zephyr/module/Kconfig.tls-generic -EXTRA_DIST+= IDE/zephyr/module/zephyr_init.c -EXTRA_DIST+= IDE/zephyr/wolfssl_test/CMakeLists.txt -EXTRA_DIST+= IDE/zephyr/wolfssl_test/install_test.sh -EXTRA_DIST+= IDE/zephyr/wolfssl_test/prj.conf -EXTRA_DIST+= IDE/zephyr/wolfssl_test/README -EXTRA_DIST+= IDE/zephyr/wolfssl_test/sample.yaml -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_sock/src/tls_sock.c -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_sock/CMakeLists.txt -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_sock/install_sample.sh -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_sock/prj.conf -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_sock/README -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_sock/sample.yaml -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_thread/src/tls_threaded.c -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_thread/CMakeLists.txt -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_thread/install_sample.sh -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_thread/prj.conf -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_thread/README -EXTRA_DIST+= IDE/zephyr/wolfssl_tls_thread/sample.yaml -EXTRA_DIST+= IDE/zephyr/README.md -EXTRA_DIST+= IDE/zephyr/setup.sh -EXTRA_DIST+= IDE/zephyr/wolfssl_zephyr.diff +EXTRA_DIST+= zephyr/CMakeLists.txt +EXTRA_DIST+= zephyr/Kconfig +EXTRA_DIST+= zephyr/Kconfig.tls-generic +EXTRA_DIST+= zephyr/zephyr_init.c +EXTRA_DIST+= zephyr/module.yml +EXTRA_DIST+= zephyr/wolfssl/options.h +EXTRA_DIST+= zephyr/user_settings.h +EXTRA_DIST+= zephyr/user_settings-tls-generic.h +EXTRA_DIST+= zephyr/README.md +EXTRA_DIST+= zephyr/samples/wolfssl_test/CMakeLists.txt +EXTRA_DIST+= zephyr/samples/wolfssl_test/README +EXTRA_DIST+= zephyr/samples/wolfssl_test/install_test.sh +EXTRA_DIST+= zephyr/samples/wolfssl_test/prj.conf +EXTRA_DIST+= zephyr/samples/wolfssl_test/sample.yaml +EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/CMakeLists.txt +EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/README +EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/install_sample.sh +EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/prj.conf +EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/sample.yaml +EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/src +EXTRA_DIST+= zephyr/samples/wolfssl_tls_sock/src/tls_sock.c +EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/CMakeLists.txt +EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/README +EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/install_sample.sh +EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/prj.conf +EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/sample.yaml +EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/src +EXTRA_DIST+= zephyr/samples/wolfssl_tls_thread/src/tls_threaded.c