commit 05499b6ded25b5cbc8b16916fa9c0a39407ab10f
Author: Nick Mathewson <[email protected]>
Date: Wed Apr 13 09:12:39 2016 -0400
Add timeouts to libor-event.a
---
src/common/include.am | 3 ++-
src/ext/include.am | 7 ++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/common/include.am b/src/common/include.am
index f978eee..e61ed68 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -96,7 +96,8 @@ LIBOR_CRYPTO_A_SOURCES = \
LIBOR_EVENT_A_SOURCES = \
src/common/compat_libevent.c \
- src/common/procmon.c
+ src/common/procmon.c \
+ src/ext/timeouts/timeout.c
src_common_libor_a_SOURCES = $(LIBOR_A_SOURCES)
src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES)
diff --git a/src/ext/include.am b/src/ext/include.am
index b4281b9..42a38f1 100644
--- a/src/ext/include.am
+++ b/src/ext/include.am
@@ -166,10 +166,7 @@ EXTRA_DIST += \
timeouts/lua/timeout-lua.c \
timeouts/Makefile \
timeouts/Rules.shrc \
- timeouts/test-timeout.c
+ timeouts/test-timeout.c \
+ timeouts/timeout-bitops.c
-# XXXX Once we use timeouts, include this in an actual library.
-EXTRA_DIST += \
- timeouts/timeout-bitops.c \
- timeout.c
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
