changeset 1320:8493172e4f3c

merge
author Matt Johnston <matt@ucc.asn.au>
date Fri, 09 Sep 2016 21:08:32 +0800
parents 21156be2bb26 (current diff) 19358268ea45 (diff)
children 2535ea9d0a6f
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libtomcrypt/Makefile.in	Thu Sep 01 23:08:56 2016 +0800
+++ b/libtomcrypt/Makefile.in	Fri Sep 09 21:08:32 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	Thu Sep 01 23:08:56 2016 +0800
+++ b/libtommath/Makefile.in	Fri Sep 09 21:08:32 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