X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=7e520c28a8de5d07341eb19fca4ca258980f0e7a;hb=9c3948cf0e8815e822af15ae7d31e97f86c3e91a;hp=6f44b008ac232bddf24e1b2b3007f82c692a2202;hpb=5c21b096ab39ece4c9ad80047144b2fde0c54758;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 6f44b008..7e520c28 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -17,9 +17,9 @@ LIBUCW_MODS= \
 	conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
 	ipaccess \
 	profile \
-	fastbuf ff-binary ff-string ff-printf ff-utf8 \
+	fastbuf ff-binary ff-string ff-printf ff-unicode \
 	fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param \
-	str_ctype str_upper str_lower unicode-utf8 stkstring \
+	str_ctype str_upper str_lower unicode stkstring \
 	wildmatch wordsplit ctmatch patimatch patmatch regex \
 	prime primetable random timer randomkey \
 	bit-ffs bit-fls \
@@ -49,7 +49,7 @@ LIBUCW_INCLUDES= \
 	bitops.h \
 	conf.h getopt.h ipaccess.h \
 	profile.h \
-	fastbuf.h lfs.h ff-utf8.h ff-binary.h \
+	fastbuf.h lfs.h ff-unicode.h ff-utf8.h ff-binary.h \
 	chartype.h unicode.h stkstring.h \
 	wildmatch.h patmatch.h \
 	db.h \
@@ -59,7 +59,7 @@ LIBUCW_INCLUDES= \
 	md5.h \
 	base64.h base224.h \
 	qache.h \
-	kmp.h kmp-search.h \
+	kmp.h kmp-search.h binsearch.h \
 	partmap.h
 
 ifdef CONFIG_UCW_THREADS
@@ -99,11 +99,11 @@ $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW)
 $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
 $(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 eltpool.test)
+TESTS+=$(addprefix $(o)/lib/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
+    slists.test kmp-test.test bbuf.test getopt.test fastbuf.test ff-unicode.test eltpool.test)
 
 $(o)/lib/regex.test: $(o)/lib/regex-t
-$(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
+$(o)/lib/unicode.test: $(o)/lib/unicode-t
 $(o)/lib/hash-test.test: $(o)/lib/hash-test
 $(o)/lib/mempool.test: $(o)/lib/mempool-t $(o)/lib/mempool-fmt-t $(o)/lib/mempool-str-t
 $(o)/lib/stkstring.test: $(o)/lib/stkstring-t
@@ -113,6 +113,7 @@ $(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-file-t $(o)/lib/fb-grow-t $(o)/lib/fb-pool-t
+$(o)/lib/ff-unicode.test: $(o)/lib/ff-unicode-t
 $(o)/lib/eltpool.test: $(o)/lib/eltpool-t
 
 ifdef CONFIG_UCW_THREADS