From 075370a39ce5f76dd212fb60311f4c7a80866f2c Mon Sep 17 00:00:00 2001 From: John Safranek Date: Sat, 20 Jun 2015 14:57:31 -0700 Subject: [PATCH] update automake includes to limit which files are added from the IDE sub-directories --- IDE/WIN/include.am | 8 ++++++++ IDE/iOS/include.am | 7 +++++++ IDE/include.am | 8 ++++++++ Makefile.am | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 IDE/WIN/include.am create mode 100644 IDE/iOS/include.am create mode 100644 IDE/include.am diff --git a/IDE/WIN/include.am b/IDE/WIN/include.am new file mode 100644 index 000000000..ac6560514 --- /dev/null +++ b/IDE/WIN/include.am @@ -0,0 +1,8 @@ +# vim:ft=automake +# included from Top Level Makefile.am +# All paths should be given relative to the root + +EXTRA_DIST+= IDE/WIN/README.txt +EXTRA_DIST+= IDE/WIN/test.vcxproj +EXTRA_DIST+= IDE/WIN/wolfssl-fips.sln +EXTRA_DIST+= IDE/WIN/wolfssl-fips.vcxproj diff --git a/IDE/iOS/include.am b/IDE/iOS/include.am new file mode 100644 index 000000000..504b4d19c --- /dev/null +++ b/IDE/iOS/include.am @@ -0,0 +1,7 @@ +# vim:ft=automake +# included from Top Level Makefile.am +# All paths should be given relative to the root + +EXTRA_DIST+= IDE/iOS/README.md +EXTRA_DIST+= IDE/iOS/wolfssl-FIPS.xcodeproj/project.pbxproj +EXTRA_DIST+= IDE/iOS/wolfssl.xcodeproj/project.pbxproj diff --git a/IDE/include.am b/IDE/include.am new file mode 100644 index 000000000..7fe6e6a60 --- /dev/null +++ b/IDE/include.am @@ -0,0 +1,8 @@ +# vim:ft=automake +# included from Top Level Makefile.am +# All paths should be given relative to the root + +include IDE/WIN/include.am +include IDE/iOS/include.am + +EXTRA_DIST+= IDE/IAR-EWARM IDE/MDK-ARM IDE/MDK5-ARM IDE/MYSQL diff --git a/Makefile.am b/Makefile.am index a47f19bf4..65b4d3d82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,7 +55,6 @@ EXTRA_DIST+= wolfssl.sln EXTRA_DIST+= wolfssl64.sln EXTRA_DIST+= valgrind-error.sh EXTRA_DIST+= gencertbuf.pl -EXTRA_DIST+= IDE EXTRA_DIST+= README.md EXTRA_DIST+= LICENSING EXTRA_DIST+= INSTALL @@ -97,6 +96,7 @@ include mcapi/wolfssl.X/nbproject/include.am include mcapi/zlib.X/nbproject/include.am include tirtos/include.am include scripts/include.am +include IDE/include.am if USE_VALGRIND TESTS_ENVIRONMENT=./valgrind-error.sh