Add timeouts to libor-event.a

diff --git a/src/common/include.am b/src/common/include.am
index f978eeeaf6f9d7e7ca054cc878e68682d716822a..e61ed685ca732622e5e1e2161bbb093dbc3a1e76 100644 (file)
--- 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 b4281b92ca791e5682892cb77f24486ce3148625..42a38f1368ba023552484d48331d89002dd58697 100644 (file)
--- 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