summaryrefslogtreecommitdiff
path: root/src/ext/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-20 14:10:52 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-20 14:10:52 -0500
commit7b0cbf22c0fb347db1e7436464865d395aed0ce5 (patch)
tree90d202086d3e75187bf42017797f8a101ffb15d3 /src/ext/include.am
parent14c9b9905180a21b8aa648b642ff5d3f7d86e29f (diff)
parent081b159abc6cc89942dc11bd5745ec0fd5cc25bb (diff)
downloadtor-7b0cbf22c0fb347db1e7436464865d395aed0ce5.tar.gz
tor-7b0cbf22c0fb347db1e7436464865d395aed0ce5.zip
Merge remote-tracking branch 'yawning/feature17783_take2'
Diffstat (limited to 'src/ext/include.am')
-rw-r--r--src/ext/include.am11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ext/include.am b/src/ext/include.am
index 47d4c03d0b..b8e59ff3ad 100644
--- a/src/ext/include.am
+++ b/src/ext/include.am
@@ -135,3 +135,14 @@ noinst_HEADERS += $(ED25519_DONNA_HDRS)
LIBED25519_DONNA=src/ext/ed25519/donna/libed25519_donna.a
noinst_LIBRARIES += $(LIBED25519_DONNA)
+src_ext_keccak_tiny_libkeccak_tiny_a_CFLAGS=
+
+src_ext_keccak_tiny_libkeccak_tiny_a_SOURCES= \
+ src/ext/keccak-tiny/keccak-tiny-unrolled.c
+
+LIBKECCAK_TINY_HDRS = \
+ src/ext/keccak-tiny/keccak-tiny.h
+
+LIBKECCAK_TINY=src/ext/keccak-tiny/libkeccak-tiny.a
+noinst_LIBRARIES += $(LIBKECCAK_TINY)
+