summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Nordstr?m <henrik@knc.nu>2016-05-11 12:35:06 +0200
committerHenrik Nordstr?m <henrik@knc.nu>2016-05-11 12:35:06 +0200
commite0eaef48cdc20b549bc306bcf989c4745a6088c9 (patch)
tree5fc303c3df8835d3949e9018a028db01ac486108
parent992f62aadb7eec9e98a334ab8ce4453f50996f8e (diff)
downloaddropbear-e0eaef48cdc20b549bc306bcf989c4745a6088c9.tar.gz
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.
-rw-r--r--libtomcrypt/Makefile.in2
-rw-r--r--libtommath/Makefile.in2
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