diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-13 09:12:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-15 09:03:22 -0400 |
| commit | 05499b6ded25b5cbc8b16916fa9c0a39407ab10f (patch) | |
| tree | f4be53cd3202c6d06a2c8aaf10de8cd8f9d275fb /src | |
| parent | 32e80ea3d32d5fd8207d16f9e5b26defa0d98a7c (diff) | |
| download | tor-05499b6ded25b5cbc8b16916fa9c0a39407ab10f.tar.gz tor-05499b6ded25b5cbc8b16916fa9c0a39407ab10f.zip | |
Add timeouts to libor-event.a
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/include.am | 3 | ||||
| -rw-r--r-- | 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 f978eeeaf6..e61ed685ca 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 b4281b92ca..42a38f1368 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 |