X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2FMakefile;h=39885a9ff4b8c30052eba804477ab434eb827e20;hb=8ab69f51fccccbcae521bd7f7e3ae27146fd1217;hp=73501c7b55a80c791881fb4959ada6c0e07510de;hpb=5c195762cfba7ef442f65df6cb5d05fdf7c7ffd1;p=libucw.git diff --git a/lib/Makefile b/lib/Makefile index 73501c7b..39885a9f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# Makefile for the UCW Library (c) 1997--2004 Martin Mares +# Makefile for the UCW Library (c) 1997--2006 Martin Mares DIRS+=lib @@ -9,15 +9,15 @@ endif LIBUCW_MODS= \ alloc alloc_str realloc mempool mempool-str mempool-fmt \ mmap pagecache partmap hashfunc \ - lists sorter bitsig kmp \ + lists slists sorter bitsig kmp \ log log-file proctitle \ - conf ipaccess \ + conf conf2 ipaccess \ profile \ fastbuf ff-printf ff-utf8 \ - fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer \ + fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow \ str_ctype str_upper str_lower unicode-utf8 stkstring \ wildmatch wordsplit ctmatch patimatch patmatch regex \ - prime random timer randomkey \ + prime primetable random timer randomkey \ bit-ffs bit-fls \ db \ url \ @@ -67,6 +67,7 @@ $(o)/lib/lizard.o: CFLAGS += $(COPT2) -funroll-loops $(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) +$(o)/lib/conf2-test: $(o)/lib/conf2-test.o $(LIBUCW) $(o)/lib/sort-test: $(o)/lib/sort-test.o $(LIBUCW) $(o)/lib/lfs-test: $(o)/lib/lfs-test.o $(LIBUCW) $(o)/lib/hash-test: $(o)/lib/hash-test.o $(LIBUCW) @@ -75,14 +76,16 @@ $(o)/lib/asort-test: $(o)/lib/asort-test.o $(LIBUCW) $(o)/lib/redblack-test: $(o)/lib/redblack-test.o $(LIBUCW) $(o)/lib/binheap-test: $(o)/lib/binheap-test.o $(LIBUCW) $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW) +$(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET) -TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test) +TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test) $(o)/lib/regex.test: $(o)/lib/regex-t $(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t $(o)/lib/hash-test.test: $(o)/lib/hash-test $(o)/lib/mempool.test: $(o)/lib/mempool-fmt-t $(o)/lib/mempool-str-t $(o)/lib/stkstring.test: $(o)/lib/stkstring-t $(o)/lib/bitops.test: $(o)/lib/bit-ffs-t $(o)/lib/bit-fls-t +$(o)/lib/slists.test: $(o)/lib/slists-t INCLUDES+=$(o)/lib/.include-stamp $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))