Updated all users of the timer interface to pass an explicit timer context.

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index f815f3b64bdfa9b5077a7cec7851263ac03ac31b..0d2b9acf507197dd07a6a3cda507e0a4c0e9dc2a 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,7 @@
-# Makefile for the UCW Library (c) 1997--2006 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
+LIBUCW=$(o)/lib/libucw.$(LS)
 
 ifdef CONFIG_UCW_DBTOOL
 PROGS+=$(o)/lib/db-tool
@@ -58,15 +59,16 @@ LIBUCW_INCLUDES= \
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
 LIBS+=-lpthread
-LIBUCW_MODS+=threads-conf workqueue
-LIBUCW_INCLUDES+=workqueue.h
+LIBUCW_MODS+=threads-conf workqueue asio fb-direct
+LIBUCW_INCLUDES+=workqueue.h asio.h
 endif
 
 ifdef CONFIG_OWN_REGEX
 include $(s)/lib/regex/Makefile
 endif
 
-LIBUCW=$(o)/lib/libucw.$(LS)
+include $(s)/lib/sorter/Makefile
+
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 
 $(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
@@ -100,6 +102,11 @@ $(o)/lib/slists.test: $(o)/lib/slists-t
 $(o)/lib/kmp-test.test: $(o)/lib/kmp-test
 $(o)/lib/bbuf.test: $(o)/lib/bbuf-t
 
+ifdef CONFIG_UCW_THREADS
+TESTS+=$(addprefix $(o)/lib/,asio.test)
+$(o)/lib/asio.test: $(o)/lib/asio-t
+endif
+
 INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
        $(s)/build/install-includes $(s)/lib run/include/lib $(?F)