xtypes&tableprinter: added parsing of size and tests

[libucw.git] / ucw / Makefile

diff --git a/ucw/Makefile b/ucw/Makefile
index 9f050505038bc59f6af7a2203cf138af30c7581a..5b62dba0638b8e18adbbbd75d31b747306873ebb 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -17,7 +17,7 @@ LIBUCW_MODS= \
        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 \
@@ -37,10 +37,11 @@ LIBUCW_MODS= \
        resource trans res-fd res-mem res-subpool res-mempool res-eltpool \
        daemon daemon-ctrl \
        signames \
-       opt opt-help opt-conf
+       opt opt-help opt-conf \
+       table table-types xtypes xtypes-basic
 
 LIBUCW_MAIN_INCLUDES= \
-       lib.h log.h threads.h time.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 \
@@ -60,14 +61,16 @@ LIBUCW_MAIN_INCLUDES= \
        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 \
-       opt.h
+       opt.h \
+       table.h table-types.h \
+       xtypes.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -90,7 +93,7 @@ include $(s)/ucw/doc/Makefile
 
 LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
 
-export LIBUCW_LIBS=
+export LIBUCW_LIBS=-lm
 ifdef CONFIG_UCW_THREADS
 LIBUCW_LIBS+=-lpthread
 endif
@@ -102,14 +105,10 @@ LIBUCW_LIBS+=-lrt
 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
@@ -134,13 +133,19 @@ endif
 $(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW)
 $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
 $(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 \
-    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 opt.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
@@ -164,7 +169,7 @@ $(o)/ucw/binheap-test.test: $(o)/ucw/binheap-test
 $(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
@@ -172,6 +177,11 @@ $(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)