Sorter buckets now use the parametrized fastbuf interface, too.

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 67deb2fc36e69fea6473852c00e3db5b66512302..c23ac8c576850cda75d49f51a718735c1ec3d892 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
@@ -16,7 +17,7 @@ LIBUCW_MODS= \
        ipaccess \
        profile \
        fastbuf ff-binary ff-string ff-printf ff-utf8 \
-       fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-atomic \
+       fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-atomic fb-param \
        str_ctype str_upper str_lower unicode-utf8 stkstring \
        wildmatch wordsplit ctmatch patimatch patmatch regex \
        prime primetable random timer randomkey \
@@ -36,7 +37,7 @@ LIBUCW_MODS= \
 LIBUCW_INCLUDES= \
        lib.h config.h threads.h math.h \
        mempool.h pagecache.h \
-       sorter.h arraysort.h \
+       sorter.h sorter-globals.h arraysort.h \
        lists.h clists.h \
        unaligned.h prefetch.h \
        bbuf.h gbuf.h bitarray.h bitsig.h \
@@ -54,13 +55,14 @@ LIBUCW_INCLUDES= \
        lizard.h \
        md5.h \
        base64.h base224.h \
-       qache.h
+       qache.h \
+       kmp.h kmp-search.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
@@ -71,6 +73,8 @@ ifdef CONFIG_OWN_GETOPT
 include $(s)/lib/getopt/Makefile
 endif
 
+include $(s)/lib/sorter/Makefile
+
 LIBUCW=$(o)/lib/libucw.$(LS)
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 
@@ -108,6 +112,11 @@ $(o)/lib/kmp-test.test: $(o)/lib/kmp-test
 $(o)/lib/bbuf.test: $(o)/lib/bbuf-t
 $(o)/lib/getopt.test: $(o)/lib/getopt-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)