Remove relics of pre-CONFIG_UCW_THREADS times.

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 0991fc9906f7c35a2c616b8c9e49f40057481dfb..14018b1c6d6fabda8868bf92ec983a9875ec3aa3 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,15 +7,16 @@ PROGS+=$(o)/lib/db-tool
 endif
 
 LIBUCW_MODS= \
+       threads \
        alloc alloc_str realloc mempool mempool-str mempool-fmt \
        mmap pagecache partmap hashfunc \
-       lists slists sorter bitsig \
+       lists slists simple-lists sorter bitsig \
        log log-file proctitle \
        conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
        ipaccess \
        profile \
-       fastbuf ff-printf ff-utf8 \
-       fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow \
+       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 \
        str_ctype str_upper str_lower unicode-utf8 stkstring \
        wildmatch wordsplit ctmatch patimatch patmatch regex \
        prime primetable random timer randomkey \
@@ -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,10 +98,12 @@ $(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))
        $(s)/build/install-includes $(s)/lib run/include/lib $(?F)
+       $(s)/build/install-includes $(o)/lib run/include/lib autoconf.h
        touch $(o)/lib/.include-stamp
 
 ifdef CONFIG_UCW_PERL