-# Makefile for the UCW Library (c) 1997--2010 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Library (c) 1997--2015 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 \
+ fw-hex \
char-cat char-upper char-lower unicode varint stkstring \
wildmatch regex \
prime primetable random \
strtonum \
resource trans res-fd res-mem res-subpool res-mempool res-eltpool \
daemon daemon-ctrl \
- signames
+ signames \
+ opt opt-help opt-conf \
+ table xtypes xtypes-basic xtypes-extra
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 \
prime.h \
bitops.h \
conf.h getopt.h ipaccess.h \
- fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h fb-socket.h \
+ fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h fb-socket.h fw-hex.h \
url.h \
mainloop.h \
process.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 \
daemon.h \
signames.h \
- sighandler.h
+ sighandler.h \
+ opt.h \
+ table.h xtypes-extra.h \
+ xtypes.h
ifdef CONFIG_UCW_THREADS
# Some modules require threading
LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
-$(o)/ucw/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw.so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
-
-ifdef CONFIG_STATIC_PIC
-$(o)/ucw/libucw.pc: $(o)/ucw/libucw-pic.a
+export LIBUCW_LIBS=-lm
+ifdef CONFIG_UCW_THREADS
+LIBUCW_LIBS+=-lpthread
+endif
+ifdef CONFIG_UCW_PCRE
+LIBUCW_LIBS+=-lpcre
+endif
+ifdef CONFIG_UCW_MONOTONIC_CLOCK
+LIBUCW_LIBS+=-lrt
endif
+
+$(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(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_INSTALL_API
-$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw,.a -pic.a .so)
+$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a .so)
endif
$(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
endif
$(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW)
$(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
-
-TESTS+=$(addprefix $(o)/ucw/,varint.test regex.test unicode.test hash-test.test mempool.test stkstring.test \
- slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test ff-varint.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 \
- gary.test time.test crc.test signames.test md5.test bitops.test)
+$(o)/ucw/opt-test: $(o)/ucw/opt-test.o $(LIBUCW)
+$(o)/ucw/table-test: $(o)/ucw/table-test.o $(LIBUCW)
+$(o)/ucw/table-test-2: $(o)/ucw/table-test-2.o $(LIBUCW)
+$(o)/ucw/table-test-align: $(o)/ucw/table-test-align.o $(LIBUCW)
+$(o)/ucw/xtypes-test: $(o)/ucw/xtypes-test.o $(LIBUCW)
+
+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 \
+ 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 \
+ table.test table-test.test table-test-2.test table-test-align.test xtypes-test.test)
$(o)/ucw/varint.test: $(o)/ucw/varint-t
$(o)/ucw/regex.test: $(o)/ucw/regex-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/time.test: $(o)/ucw/time-conf-t
$(o)/ucw/crc.test: $(o)/ucw/crc-t
$(o)/ucw/signames.test: $(o)/ucw/signames-t
$(o)/ucw/md5.test: $(o)/ucw/md5-t
+$(o)/ucw/opt.test: $(o)/ucw/opt-test
+$(o)/ucw/table.test: $(o)/ucw/table-t
+$(o)/ucw/table-test.test: $(o)/ucw/table-test
+$(o)/ucw/table-test-2.test: $(o)/ucw/table-test-2
+$(o)/ucw/table-test-align.test: $(o)/ucw/table-test-align
+$(o)/ucw/xtypes-test.test: $(o)/ucw/xtypes-test
ifdef CONFIG_UCW_THREADS
TESTS+=$(addprefix $(o)/ucw/,asio.test)
CONFIGS+=libucw
-INSTALL_LIB_TARGETS+=install-libucw-lib
+INSTALL_TARGETS+=install-libucw-lib
install-libucw-lib:
install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
- install -m 644 run/lib/libucw.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so.$(UCW_ABI_VERSION)
+ install -m 644 run/lib/libucw$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0.0
+ ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0
.PHONY: install-libucw-lib
-INSTALL_API_TARGETS+=install-libucw-api
-install-libucw-api:
+INSTALL_TARGETS+=install-libucw-api
+install-libucw-api: install-ucw-sorter-api
install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
- ln -sf libucw.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so
- install -m 644 run/lib/libucw.a $(DESTDIR)$(INSTALL_LIB_DIR)
- install -m 644 run/lib/libucw-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
+ ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so
+ install -m 644 run/lib/libucw$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
.PHONY: install-libucw-api
-INSTALL_CONFIG_TARGETS+=install-libucw-config
+INSTALL_TARGETS+=install-libucw-config
install-libucw-config:
install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
projects / libucw.git / blobdiff