changeset 1300:4fb9261ef02a

Merge pull request #29 from hno/patch-out-of-tree Support out-of-tree builds usign bundled libtom
author Matt Johnston <matt@ucc.asn.au>
date Thu, 12 May 2016 23:47:35 +0800
parents 5abbecdecba4 (current diff) 24e563b90f12 (diff)
children e742c0e9b941 e7f11ed5fe28 18154dc469f5 8aed91ebf3c7 ab4a3f783bfd
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libtomcrypt/Makefile.in	Wed May 04 17:59:34 2016 +0200
+++ b/libtomcrypt/Makefile.in	Thu May 12 23:47:35 2016 +0800
@@ -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
--- a/libtommath/Makefile.in	Wed May 04 17:59:34 2016 +0200
+++ b/libtommath/Makefile.in	Thu May 12 23:47:35 2016 +0800
@@ -9,7 +9,7 @@
 [email protected]@
 
 # 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