X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=3db20b9f155a746eafbef4cd36ee2de20a10b584;hb=8e051b81b17a917637a16eb666443c95b053278d;hp=c505e7ebf30f35091de770f9d91cc0674138184b;hpb=337379bc207a951cc298b1cffbb6a286e376cd08;p=libucw.git

diff --git a/ucw/Makefile b/ucw/Makefile
index c505e7eb..3db20b9f 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -3,28 +3,23 @@
 DIRS+=ucw
 LIBUCW=$(o)/ucw/libucw.pc
 
-ifdef CONFIG_UCW_DBTOOL
-PROGS+=$(o)/ucw/db-tool
-endif
-
 PROGS+=$(o)/ucw/basecode
 
 LIBUCW_MODS= \
 	threads \
 	alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \
-	mmap pagecache partmap hashfunc \
-	lists slists simple-lists bitsig \
+	mmap partmap hashfunc \
+	slists simple-lists bitsig \
 	log log-file proctitle \
 	conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
 	ipaccess \
 	profile \
 	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 fb-socket \
+	fb-file carefulio fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket \
 	char-cat char-upper char-lower unicode stkstring \
 	wildmatch regex \
 	prime primetable random timer randomkey \
 	bit-ffs bit-fls \
-	db \
 	url \
 	mainloop exitstatus runcmd sighandler \
 	lizard lizard-safe adler32 \
@@ -38,9 +33,9 @@ LIBUCW_MODS= \
 
 LIBUCW_INCLUDES= \
 	lib.h config.h threads.h \
-	mempool.h pagecache.h \
+	mempool.h \
 	arraysort.h \
-	lists.h clists.h slists.h simple-lists.h \
+	clists.h slists.h simple-lists.h \
 	string.h stkstring.h unicode.h chartype.h regex.h \
 	wildmatch.h \
 	unaligned.h prefetch.h \
@@ -48,12 +43,11 @@ LIBUCW_INCLUDES= \
 	hashfunc.h hashtable.h \
 	heap.h binheap.h binheap-node.h \
 	redblack.h \
-	binsearch.h \
+	binsearch.h prime.h \
 	bitops.h \
 	conf.h getopt.h ipaccess.h \
 	profile.h \
 	fastbuf.h lfs.h ff-unicode.h ff-binary.h \
-	db.h \
 	url.h \
 	mainloop.h \
 	lizard.h \
@@ -83,8 +77,6 @@ $(o)/ucw/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
 $(o)/ucw/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
-$(o)/ucw/db-test: $(o)/ucw/db-test.o $(LIBUCW)
-$(o)/ucw/db-tool: $(o)/ucw/db-tool.o $(LIBUCW)
 $(o)/ucw/conf-test: $(o)/ucw/conf-test.o $(LIBUCW)
 $(o)/ucw/lfs-test: $(o)/ucw/lfs-test.o $(LIBUCW)
 $(o)/ucw/hash-test: $(o)/ucw/hash-test.o $(LIBUCW)
@@ -99,9 +91,10 @@ $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
 $(o)/ucw/basecode: $(o)/ucw/basecode.o $(LIBUCW)
 
 TESTS+=$(addprefix $(o)/ucw/,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 \
+    slists.test kmp-test.test bbuf.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 basecode.test)
+    redblack-test.test basecode.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)
 
 $(o)/ucw/regex.test: $(o)/ucw/regex-t
 $(o)/ucw/unicode.test: $(o)/ucw/unicode-t
@@ -113,10 +106,8 @@ $(o)/ucw/slists.test: $(o)/ucw/slists-t
 $(o)/ucw/kmp-test.test: $(o)/ucw/kmp-test
 $(o)/ucw/bbuf.test: $(o)/ucw/bbuf-t
 $(o)/ucw/getopt.test: $(o)/ucw/getopt-t
-$(o)/ucw/fastbuf.test: $(o)/ucw/fb-file-t $(o)/ucw/fb-grow-t $(o)/ucw/fb-pool-t
 $(o)/ucw/ff-unicode.test: $(o)/ucw/ff-unicode-t
 $(o)/ucw/eltpool.test: $(o)/ucw/eltpool-t
-$(o)/ucw/fb-socket.test: $(o)/ucw/fb-socket-t
 $(o)/ucw/string.test: $(o)/ucw/str-hex-t $(o)/ucw/str-esc-t
 $(o)/ucw/sha1.test: $(o)/ucw/sha1-t $(o)/ucw/sha1-hmac-t
 $(o)/ucw/trie-test.test: $(o)/ucw/trie-test
@@ -124,6 +115,8 @@ $(o)/ucw/asort-test.test: $(o)/ucw/asort-test
 $(o)/ucw/binheap-test.test: $(o)/ucw/binheap-test
 $(o)/ucw/redblack-test.test: $(o)/ucw/redblack-test
 $(o)/ucw/basecode.test: $(o)/ucw/basecode
+$(addprefix $(o)/ucw/fb-,file.test grow.test pool.test socket.test atomic.test \
+	limfd.test temp.test mem.test buffer.test mmap.test): %.test: %-t
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/ucw/,asio.test)