| From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@knc.nu> |
| Date: Wed, 11 May 2016 12:35:06 +0200 |
| Subject: [PATCH] Support out-of-tree builds usign bundled libtom |
| |
| When building out-of-tree we need both source and generated |
| folders in include paths to find both distributed and generated |
| headers. |
| |
| |
| |
| Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| Upstream-Status: Backport |
| --- |
| libtomcrypt/Makefile.in | 2 +- |
| libtommath/Makefile.in | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in |
| index 3056ef0..7970700 100644 |
| --- a/libtomcrypt/Makefile.in |
| +++ b/libtomcrypt/Makefile.in |
| @@ -19,7 +19,7 @@ srcdir=@srcdir@ |
| |
| # Compilation flags. Note the += does not write over the user's CFLAGS! |
| # The rest of the flags come from the parent Dropbear makefile |
| -CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/ |
| +CFLAGS += -c -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/ |
| |
| # additional warnings (newer GCC 3.4 and higher) |
| ifdef GCC_34 |
| diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in |
| index 06aba68..019c50b 100644 |
| --- a/libtommath/Makefile.in |
| +++ b/libtommath/Makefile.in |
| @@ -9,7 +9,7 @@ VPATH=@srcdir@ |
| srcdir=@srcdir@ |
| |
| # So that libtommath can include Dropbear headers for options and m_burn() |
| -CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../ |
| +CFLAGS += -I. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../ |
| |
| ifndef IGNORE_SPEED |
| |