X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=14018b1c6d6fabda8868bf92ec983a9875ec3aa3;hb=749403f3dfb3d163068d133a25cae31c8994ee9b;hp=775c7de6c89412b96a5812c0ad44b2d010dad9a5;hpb=9dc6f017d0b8c992d2df15a51cf96fc431260df3;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 775c7de6..14018b1c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,6 +7,7 @@ PROGS+=$(o)/lib/db-tool
 endif
 
 LIBUCW_MODS= \
+	threads \
 	alloc alloc_str realloc mempool mempool-str mempool-fmt \
 	mmap pagecache partmap hashfunc \
 	lists slists simple-lists sorter bitsig \
@@ -28,10 +29,11 @@ LIBUCW_MODS= \
 	base64 base224 \
 	sync \
 	qache \
-	string
+	string \
+	bbuf
 
 LIBUCW_INCLUDES= \
-	lib.h config.h math.h \
+	lib.h config.h threads.h math.h \
 	mempool.h pagecache.h \
 	sorter.h arraysort.h \
 	lists.h clists.h \
@@ -53,6 +55,13 @@ LIBUCW_INCLUDES= \
 	base64.h base224.h \
 	qache.h
 
+ifdef CONFIG_UCW_THREADS
+# Some modules require threading
+LIBS+=-lpthread
+LIBUCW_MODS+=threads-conf workqueue
+LIBUCW_INCLUDES+=workqueue.h
+endif
+
 ifdef CONFIG_OWN_REGEX
 include $(s)/lib/regex/Makefile
 endif
@@ -80,7 +89,7 @@ $(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)
 
-TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test kmp-test.test)
+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
 $(o)/lib/hash-test.test: $(o)/lib/hash-test
@@ -89,6 +98,7 @@ $(o)/lib/stkstring.test: $(o)/lib/stkstring-t
 $(o)/lib/bitops.test: $(o)/lib/bit-ffs-t $(o)/lib/bit-fls-t
 $(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
 
 INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))