changeset 1301:e742c0e9b941

merge
author Matt Johnston <matt@ucc.asn.au>
date Tue, 21 Jun 2016 22:04:30 +0800
parents 251c5f7a6e96 (current diff) 4fb9261ef02a (diff)
children 19358268ea45
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libtomcrypt/Makefile.in	Sun Jun 19 20:38:38 2016 +0800
+++ b/libtomcrypt/Makefile.in	Tue Jun 21 22:04:30 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	Sun Jun 19 20:38:38 2016 +0800
+++ b/libtommath/Makefile.in	Tue Jun 21 22:04:30 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