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 \
+ lists slists simple-lists bitsig \
log log-file proctitle \
conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
ipaccess \
LIBUCW_INCLUDES= \
lib.h config.h threads.h \
mempool.h pagecache.h \
- sorter.h sorter-globals.h arraysort.h \
+ arraysort.h \
lists.h clists.h slists.h simple-lists.h \
unaligned.h prefetch.h \
bbuf.h gbuf.h bitarray.h bitsig.h \
$(o)/lib/db-test: $(o)/lib/db-test.o $(LIBUCW)
$(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
$(o)/lib/conf-test: $(o)/lib/conf-test.o $(LIBUCW)
-$(o)/lib/sort-test: $(o)/lib/sort-test.o $(LIBUCW)
$(o)/lib/lfs-test: $(o)/lib/lfs-test.o $(LIBUCW)
$(o)/lib/hash-test: $(o)/lib/hash-test.o $(LIBUCW)
$(o)/lib/str-test: $(o)/lib/str-test.o $(LIBUCW)
$(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 fastbuf.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/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)
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)
+$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES)) obj/autoconf.h
+ $(Q)$(s)/build/install-includes $(<D) run/include/lib $(LIBUCW_INCLUDES)
$(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
$(Q)touch $@
run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc