diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2018-01-23 22:44:18 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2018-01-23 22:44:18 +0800 |
| commit | ba23b823dcec4203dcee59204f0a7dac1a390d96 (patch) | |
| tree | ace444899b2c35b092a0380097fb978d594f9615 | |
| parent | fa3b0dd3ca62309c7d786df849da31426348c0bf (diff) | |
fix updates to libtomcrypt/libtommath for out of tree builds
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libtomcrypt/Makefile.in | 3 | ||||
| -rw-r--r-- | libtommath/Makefile.in | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8be542a..a3b61b3 100644 --- a/configure.ac +++ b/configure.ac @@ -828,6 +828,7 @@ AS_MKDIR_P(libtomcrypt/src/modes/ecb) AS_MKDIR_P(libtomcrypt/src/modes/ofb) AS_MKDIR_P(libtomcrypt/src/modes/f8) AS_MKDIR_P(libtomcrypt/src/modes/lrw) +AS_MKDIR_P(libtomcrypt/src/modes/xts) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/bit) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/boolean) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice) diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in index d9b3668..1c45186 100644 --- a/libtomcrypt/Makefile.in +++ b/libtomcrypt/Makefile.in @@ -9,7 +9,8 @@ VERSION=1.17 PLATFORM := $(shell uname | sed -e 's/_.*//') -srcdir=. +VPATH=@srcdir@ +srcdir=@srcdir@ # Compiler and Linker Names #CC=gcc diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in index dbcd2a0..d2e78fc 100644 --- a/libtommath/Makefile.in +++ b/libtommath/Makefile.in @@ -2,7 +2,8 @@ # #Tom St Denis -srcdir=. +VPATH=@srcdir@ +srcdir=@srcdir@ # So that libtommath can include Dropbear headers for options and m_burn() CFLAGS += -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../ @@ -26,8 +27,6 @@ endif coverage: LIBNAME:=-Wl,--whole-archive $(LIBNAME) -Wl,--no-whole-archive -include makefile.include - LCOV_ARGS=--directory . #START_INS |