# HG changeset patch # User Henrik Nordström # Date 1462962906 -7200 # Node ID 24e563b90f12e34bd0dd3d9949bf1b525e388568 # Parent 5abbecdecba4425e8bb9482f0ca05d87054a344f 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. diff -r 5abbecdecba4 -r 24e563b90f12 libtomcrypt/Makefile.in --- a/libtomcrypt/Makefile.in Wed May 04 17:59:34 2016 +0200 +++ b/libtomcrypt/Makefile.in Wed May 11 12:35:06 2016 +0200 @@ -19,7 +19,7 @@ # 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 -r 5abbecdecba4 -r 24e563b90f12 libtommath/Makefile.in --- a/libtommath/Makefile.in Wed May 04 17:59:34 2016 +0200 +++ b/libtommath/Makefile.in Wed May 11 12:35:06 2016 +0200 @@ -9,7 +9,7 @@ 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