Add timeouts to libor-event.a

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)

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