-# Makefile for the UCW Library (c) 1997--2010 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Library (c) 1997--2014 Martin Mares <mj@ucw.cz>
DIRS+=ucw
LIBUCW=$(o)/ucw/libucw.pc
LIBUCW_MODS= \
threads \
- alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \
+ alloc alloc_str alloc-std \
+ bigalloc mempool mempool-str mempool-fmt eltpool \
partmap hashfunc \
slists simple-lists bitsig \
log log-stream log-file log-syslog log-conf tbf \
conf-context conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section conf-getopt \
ipaccess \
fastbuf ff-binary ff-string ff-printf ff-unicode ff-varint ff-stkstring \
- fb-file fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket fb-multi \
+ fb-file fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket fb-multi fb-null \
char-cat char-upper char-lower unicode varint stkstring \
wildmatch regex \
prime primetable random \
base64 base224 \
io-careful io-sync io-mmap io-size \
string str-esc str-split str-match str-imatch str-hex str-fix \
- bbuf gary gary-mp \
+ bbuf gary \
getopt \
strtonum \
resource trans res-fd res-mem res-subpool res-mempool res-eltpool \
opt opt-help opt-conf
LIBUCW_MAIN_INCLUDES= \
- lib.h log.h threads.h time.h \
- mempool.h eltpool.h \
+ lib.h log.h tbf.h threads.h time.h \
+ alloc.h mempool.h eltpool.h \
clists.h slists.h simple-lists.h \
string.h stkstring.h unicode.h varint.h chartype.h regex.h \
wildmatch.h \
lizard.h \
md5.h sha1.h crc.h \
base64.h base224.h \
- kmp.h kmp-search.h binsearch.h \
+ kmp.h kmp-search.h trie.h binsearch.h \
partmap.h \
strtonum.h \
resource.h trans.h \
LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
-export LIBUCW_LIBS=
+export LIBUCW_LIBS=-lm
ifdef CONFIG_UCW_THREADS
LIBUCW_LIBS+=-lpthread
endif
endif
$(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw$(LV)-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
$(o)/ucw/libucw$(LV).so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
$(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.0
$(o)/ucw/libucw$(LV).so: LIBS+=$(LIBUCW_LIBS)
-ifdef CONFIG_STATIC_PIC
-$(o)/ucw/libucw.pc: $(o)/ucw/libucw$(LV)-pic.a
-endif
ifdef CONFIG_INSTALL_API
$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a .so)
endif
TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test eltpool.test \
- fb-socket.test trie-test.test string.test sha1.test asort-test.test binheap-test.test \
- redblack-test.test fb-file.test fb-grow.test fb-pool.test fb-atomic.test \
- fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test fb-multi.test url.test strtonum-test.test \
+ trie-test.test string.test sha1.test asort-test.test binheap-test.test \
+ fb-file.test fb-socket.test fb-grow.test fb-pool.test fb-atomic.test fb-limfd.test fb-temp.test \
+ fb-mem.test fb-buffer.test fb-mmap.test fb-multi.test fb-null.test \
+ redblack-test.test url.test strtonum-test.test \
gary.test time.test crc.test signames.test md5.test bitops.test opt.test)
$(o)/ucw/varint.test: $(o)/ucw/varint-t
$(o)/ucw/redblack-test.test: $(o)/ucw/redblack-test
$(o)/ucw/strtonum-test.test: $(o)/ucw/strtonum-test
$(addprefix $(o)/ucw/fb-,file.test grow.test pool.test socket.test atomic.test \
- limfd.test temp.test mem.test buffer.test mmap.test multi.test): %.test: %-t
+ limfd.test temp.test mem.test buffer.test mmap.test multi.test null.test): %.test: %-t
$(o)/ucw/url.test: $(o)/ucw/url-t
-$(o)/ucw/gary.test: $(o)/ucw/gary-t $(o)/ucw/gary-mp-t
+$(o)/ucw/gary.test: $(o)/ucw/gary-t
$(o)/ucw/time.test: $(o)/ucw/time-conf-t
$(o)/ucw/crc.test: $(o)/ucw/crc-t
$(o)/ucw/signames.test: $(o)/ucw/signames-t