changeset 1454:ef310db5ccec

fix updates to libtomcrypt/libtommath for out of tree builds
author Matt Johnston <matt@ucc.asn.au>
date Tue, 23 Jan 2018 22:44:18 +0800
parents 336cae2238ca
children 4afde04f0607 fb90a5ba84e0
files configure.ac libtomcrypt/Makefile.in libtommath/Makefile.in
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Oct 18 22:41:27 2017 +0800
+++ b/configure.ac	Tue Jan 23 22:44:18 2018 +0800
@@ -828,6 +828,7 @@
 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)
--- a/libtomcrypt/Makefile.in	Wed Oct 18 22:41:27 2017 +0800
+++ b/libtomcrypt/Makefile.in	Tue Jan 23 22:44:18 2018 +0800
@@ -9,7 +9,8 @@
 PLATFORM := $(shell uname | sed -e 's/_.*//')
 
 
-srcdir=.
+VPATH=@srcdir@
+srcdir=@srcdir@
 
 # Compiler and Linker Names
 #CC=gcc
--- a/libtommath/Makefile.in	Wed Oct 18 22:41:27 2017 +0800
+++ b/libtommath/Makefile.in	Tue Jan 23 22:44:18 2018 +0800
@@ -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 @@
 
 coverage: LIBNAME:=-Wl,--whole-archive $(LIBNAME)  -Wl,--no-whole-archive
 
-include makefile.include
-
 LCOV_ARGS=--directory .
 
 #START_INS