Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 669f356b152925c7fc69cfa4a9acf64312d85857..432a14ec97456998a3dd6062c77e2245b47842bb 100644 (file)
--- 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 \
@@ -33,8 +33,7 @@ LIBUCW_MODS= \
        qache \
        string \
        bbuf \
-       getopt \
-       xml
+       getopt
 
 LIBUCW_INCLUDES= \
        lib.h config.h threads.h \
@@ -50,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-binary.h \
        chartype.h unicode.h stkstring.h \
        wildmatch.h patmatch.h \
        db.h \
@@ -61,8 +60,7 @@ LIBUCW_INCLUDES= \
        base64.h base224.h \
        qache.h \
        kmp.h kmp-search.h binsearch.h \
-       partmap.h \
-       xml.h
+       partmap.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -88,11 +86,6 @@ $(o)/lib/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/lib/hashfunc.o $(o)/lib/hashfunc.oo: CFLAGS += -funroll-loops
 $(o)/lib/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
-$(o)/lib/xml.o: $(o)/lib/xml-ucat.h
-$(o)/lib/xml-ucat.h: $(s)/lib/xml-ucat.pl
-       $(M)GEN $@
-       $(Q)$< >$@
-
 $(o)/lib/db-test: $(o)/lib/db-test.o $(LIBUCW)
 $(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
 $(o)/lib/conf-test: $(o)/lib/conf-test.o $(LIBUCW)
@@ -106,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
@@ -120,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