-obj/lib/db-test: obj/lib/db-test.o $(LIBSH)
-obj/lib/db-tool: obj/lib/db-tool.o $(LIBSH)
-obj/lib/buckettool: obj/lib/buckettool.o $(LIBSH)
-obj/lib/conf-test: obj/lib/conf-test.o $(LIBSH)
-obj/lib/sort-test: obj/lib/sort-test.o $(LIBSH)
-obj/lib/lfs-test: obj/lib/lfs-test.o $(LIBSH)
-obj/lib/hash-test: obj/lib/hash-test.o $(LIBSH)
-obj/lib/str-test: obj/lib/str-test.o $(LIBSH)
-obj/lib/asort-test: obj/lib/asort-test.o $(LIBSH)
-obj/lib/redblack-test: obj/lib/redblack-test.o $(LIBSH)
-obj/lib/binheap-test: obj/lib/binheap-test.o $(LIBSH)
-obj/lib/lizard-test: obj/lib/lizard-test.o $(LIBSH)
+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