X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=0d2b9acf507197dd07a6a3cda507e0a4c0e9dc2a;hb=116954d49373438c669eadd764e03ee8ac4211bb;hp=e8bee413af431d2241d40eb2c3b542f22269e13f;hpb=eb4022995eaad02272b6a763e12846bb8872604b;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index e8bee413..0d2b9acf 100644
--- 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
@@ -8,7 +9,7 @@ endif
 
 LIBUCW_MODS= \
 	threads \
-	alloc alloc_str realloc mempool mempool-str mempool-fmt \
+	alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt \
 	mmap pagecache partmap hashfunc \
 	lists slists simple-lists sorter bitsig \
 	log log-file proctitle \
@@ -30,8 +31,7 @@ LIBUCW_MODS= \
 	sync \
 	qache \
 	string \
-	bbuf \
-	workqueue
+	bbuf
 
 LIBUCW_INCLUDES= \
 	lib.h config.h threads.h math.h \
@@ -54,21 +54,21 @@ LIBUCW_INCLUDES= \
 	lizard.h \
 	md5.h \
 	base64.h base224.h \
-	qache.h \
-	workqueue.h
+	qache.h
 
 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))
@@ -91,8 +91,6 @@ $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW)
 $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
 $(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 
-$(o)/lib/workqueue-t: LIBS+=-lpthread  # FIXME
-
 TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test kmp-test.test bbuf.test)
 $(o)/lib/regex.test: $(o)/lib/regex-t
 $(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
@@ -104,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)