X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=dfdc9fbe49ef920175ab605660e2b56ceca15e7e;hb=a7bae3293ad367903df28054af1e0b9be3d169b5;hp=e45a339c752f28f69eb600208302ca17578ba851;hpb=6df8b39888326f1e7d8b1ab780699ff72dcc68d9;p=libucw.git

diff --git a/ucw/Makefile b/ucw/Makefile
index e45a339c..dfdc9fbe 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the UCW Library (c) 1997--2014 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
@@ -18,6 +18,7 @@ LIBUCW_MODS= \
 	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-null \
+	fw-hex \
 	char-cat char-upper char-lower unicode varint stkstring \
 	wildmatch regex \
 	prime primetable random \
@@ -38,7 +39,7 @@ LIBUCW_MODS= \
 	daemon daemon-ctrl \
 	signames \
 	opt opt-help opt-conf \
-	table
+	table xtypes xtypes-basic xtypes-extra
 
 LIBUCW_MAIN_INCLUDES= \
 	lib.h log.h tbf.h threads.h time.h \
@@ -54,7 +55,7 @@ LIBUCW_MAIN_INCLUDES= \
 	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 \
@@ -69,7 +70,8 @@ LIBUCW_MAIN_INCLUDES= \
 	signames.h \
 	sighandler.h \
 	opt.h \
-	table.h
+	table.h xtypes-extra.h \
+	xtypes.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -133,7 +135,9 @@ $(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 \
@@ -142,7 +146,7 @@ TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.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-align.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
@@ -176,7 +180,9 @@ $(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)