WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

For distro build don't install options.h (conflicts with multi-arch). Fix for BUILD_DISTRO excludes with indent.

pull/649/head
David Garske 2016-11-29 13:29:19 -08:00
parent 13bdcc518d
commit a2dc01413c
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile.am
View File

@ -89,25 +89,24 @@ include tests/include.am
include sslSniffer/sslSnifferTest/include.am include sslSniffer/sslSnifferTest/include.am
include rpm/include.am include rpm/include.am
if BUILD_DISTRO # Exclude references to non-DFSG sources from build files
# Exclude references to non-DFSG sources from build files if !BUILD_DISTRO
else include mqx/util_lib/Sources/include.am
include mqx/util_lib/Sources/include.am include mqx/wolfcrypt_benchmark/Sources/include.am
include mqx/wolfcrypt_benchmark/Sources/include.am include mqx/wolfcrypt_test/Sources/include.am
include mqx/wolfcrypt_test/Sources/include.am include mqx/wolfssl/include.am
include mqx/wolfssl/include.am include mqx/wolfssl_client/Sources/include.am
include mqx/wolfssl_client/Sources/include.am include mplabx/include.am
include mplabx/include.am include mplabx/wolfcrypt_benchmark.X/nbproject/include.am
include mplabx/wolfcrypt_benchmark.X/nbproject/include.am include mplabx/wolfcrypt_test.X/nbproject/include.am
include mplabx/wolfcrypt_test.X/nbproject/include.am include mplabx/wolfssl.X/nbproject/include.am
include mplabx/wolfssl.X/nbproject/include.am include mcapi/include.am
include mcapi/include.am include mcapi/wolfcrypt_mcapi.X/nbproject/include.am
include mcapi/wolfcrypt_mcapi.X/nbproject/include.am include mcapi/wolfcrypt_test.X/nbproject/include.am
include mcapi/wolfcrypt_test.X/nbproject/include.am include mcapi/wolfssl.X/nbproject/include.am
include mcapi/wolfssl.X/nbproject/include.am include mcapi/zlib.X/nbproject/include.am
include mcapi/zlib.X/nbproject/include.am include tirtos/include.am
include tirtos/include.am include IDE/include.am
include IDE/include.am
endif endif
include scripts/include.am include scripts/include.am

8
cyassl/include.am
View File

@ -16,10 +16,16 @@ nobase_include_HEADERS+= \
cyassl/certs_test.h \ cyassl/certs_test.h \
cyassl/test.h \ cyassl/test.h \
cyassl/version.h \ cyassl/version.h \
cyassl/options.h \
cyassl/ocsp.h \ cyassl/ocsp.h \
cyassl/crl.h cyassl/crl.h
noinst_HEADERS+= \ noinst_HEADERS+= \
cyassl/internal.h cyassl/internal.h
# For distro build don't install options.h.
# It depends on the architecture and conflicts with Multi-Arch.
if BUILD_DISTRO
noinst_HEADERS+= cyassl/options.h
else
nobase_include_HEADERS+= cyassl/options.h
endif

8
wolfssl/include.am
View File

@ -16,10 +16,16 @@ nobase_include_HEADERS+= \
wolfssl/certs_test.h \ wolfssl/certs_test.h \
wolfssl/test.h \ wolfssl/test.h \
wolfssl/version.h \ wolfssl/version.h \
wolfssl/options.h \
wolfssl/ocsp.h \ wolfssl/ocsp.h \
wolfssl/crl.h wolfssl/crl.h
noinst_HEADERS+= \ noinst_HEADERS+= \
wolfssl/internal.h wolfssl/internal.h
# For distro build don't install options.h.
# It depends on the architecture and conflicts with Multi-Arch.
if BUILD_DISTRO
noinst_HEADERS+= wolfssl/options.h
else
nobase_include_HEADERS+= wolfssl/options.h
endif