-# 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
+CONFIGS+=library
+LIBUCW=$(o)/lib/libucw.pc
ifdef CONFIG_UCW_DBTOOL
PROGS+=$(o)/lib/db-tool
LIBUCW_MODS= \
threads \
- alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt \
+ alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \
mmap pagecache partmap hashfunc \
lists slists simple-lists sorter bitsig \
log log-file proctitle \
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-pool fb-atomic fb-param \
str_ctype str_upper str_lower unicode-utf8 stkstring \
wildmatch wordsplit ctmatch patimatch patmatch regex \
prime primetable random timer randomkey \
ifdef CONFIG_UCW_THREADS
# Some modules require threading
-LIBUCW_MODS+=threads-conf workqueue
-LIBUCW_INCLUDES+=workqueue.h semaphore.h
+LIBUCW_MODS+=threads-conf workqueue asio fb-direct
+LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
endif
ifdef CONFIG_OWN_REGEX
include $(s)/lib/getopt/Makefile
endif
-LIBUCW=$(o)/lib/libucw.pc
+include $(s)/lib/sorter/Makefile
+
LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
$(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
$(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 bbuf.test getopt.test)
+ slists.test kmp-test.test bbuf.test getopt.test fastbuf.test eltpool.test)
$(o)/lib/regex.test: $(o)/lib/regex-t
$(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
$(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
+$(o)/lib/fastbuf.test: $(o)/lib/fb-file-t $(o)/lib/fb-grow-t $(o)/lib/fb-pool-t
+$(o)/lib/eltpool.test: $(o)/lib/eltpool-t
+
+ifdef CONFIG_UCW_THREADS
+TESTS+=$(addprefix $(o)/lib/,asio.test)
+$(o)/lib/asio.test: $(o)/lib/asio-t
+endif
API_LIBS+=libucw
API_INCLUDES+=$(o)/lib/.include-stamp
+# XXX: We do not have a dependency on autoconf.h, but it is generated by configure
+# before make ever starts, so this is safe.
$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
$(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
- # XXX: We do not have a dependency on autoconf.h, but it is generated by configure
- # before make ever starts, so this is safe.
- $(Q)$(s)/build/install-includes obj/lib run/include/lib autoconf.h
+ $(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
$(Q)touch $@
run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc