# Makefile for the UCW Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
DIRS+=lib
-LIBUCW=$(o)/lib/libucw.$(LS)
+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 \
getopt
LIBUCW_INCLUDES= \
- lib.h config.h threads.h math.h \
+ lib.h config.h threads.h \
mempool.h pagecache.h \
sorter.h sorter-globals.h arraysort.h \
- lists.h clists.h \
+ lists.h clists.h slists.h simple-lists.h \
unaligned.h prefetch.h \
bbuf.h gbuf.h bitarray.h bitsig.h \
hashfunc.h hashtable.h \
heap.h binheap.h binheap-node.h \
redblack.h \
+ binsearch.h \
+ bitops.h \
conf.h getopt.h ipaccess.h \
profile.h \
- fastbuf.h lfs.h ff-utf8.h \
+ fastbuf.h lfs.h ff-utf8.h ff-binary.h \
chartype.h unicode.h stkstring.h \
wildmatch.h patmatch.h \
db.h \
md5.h \
base64.h base224.h \
qache.h \
- kmp.h kmp-search.h
+ kmp.h kmp-search.h \
+ partmap.h
ifdef CONFIG_UCW_THREADS
# Some modules require threading
-LIBS+=-lpthread
LIBUCW_MODS+=threads-conf workqueue asio fb-direct
-LIBUCW_INCLUDES+=workqueue.h asio.h
+LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
endif
ifdef CONFIG_OWN_REGEX
include $(s)/lib/sorter/Makefile
-LIBUCW=$(o)/lib/libucw.$(LS)
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 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/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-grow-t $(o)/lib/fb-pool-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
-INCLUDES+=$(o)/lib/.include-stamp
+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))
- $(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
+ $(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
+ $(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
+ $(Q)touch $@
+run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc
ifdef CONFIG_UCW_PERL
include $(s)/lib/perl/Makefile