# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1518260634 -28800
# Node ID d54bbb645f023078645121c18786a4925c701829
# Parent  b7cd40b0730ac944e69755ffac30211d213dcaec# Parent  3a916b945185f826243151346fb4938bf7892a8b
merge

diff -r b7cd40b0730a -r d54bbb645f02 .travis.yml
diff -r b7cd40b0730a -r d54bbb645f02 libtomcrypt/Makefile.in
--- a/libtomcrypt/Makefile.in	Sat Feb 10 08:27:30 2018 +0800
+++ b/libtomcrypt/Makefile.in	Sat Feb 10 19:03:54 2018 +0800
@@ -22,6 +22,7 @@
 # make -f makefile.unix CC=icc AR=xiar CFLAGS="-fast -DUSE_LTM -DLTM_DESC -I/path/to/libtommath" EXTRALIBS=/path/to/libtommath/libtommath.a all
 #
 
+# Dropbear can build out of tree
 VPATH=@srcdir@
 srcdir=@srcdir@
 
@@ -32,10 +33,11 @@
 INCPATH   = $(PREFIX)/include
 DATAPATH  = $(PREFIX)/share/doc/libtomcrypt/pdf
 BINPATH   = $(PREFIX)/bin
-CC        = cc
-AR        = ar
+# Dropbear passes paths from parent makefile
+#CC        = cc
+#AR        = ar
 ARFLAGS   = r
-RANLIB    = ranlib
+#RANLIB    = ranlib
 #CFLAGS    = -O2 -DUSE_LTM -DLTM_DESC -I../libtommath
 EXTRALIBS = ../libtommath/libtommath.a