X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile;h=54ebe46b0be783848f8780a844d749dd39d9ac11;hb=e89d1302e7a67e3c46753ec0dd93d13f2d2080de;hp=7e1f5b83bd25dbf3b9168b13ba5c1d875ec90704;hpb=87068a647539633ea26096e6e363c508f006ca5a;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 7e1f5b83..54ebe46b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,30 +1,43 @@
-# Makefile for the Sherlock Library (c) 1997--2002 Martin Mares <mj@ucw.cz>
+# Makefile for the Sherlock Library (c) 1997--2004 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
 PROGS+=obj/lib/db-tool obj/lib/buckettool
+TESTS+=obj/lib/regex-ut
 
 LIBSH_MODS=alloc alloc_str ctmatch db fastbuf fb-file fb-mem lists \
-	log log2 md5 md5hex mmap pagecache patimatch patmatch pool \
+	log log-file log2 md5 md5hex mmap pagecache patimatch patmatch pool pool-str \
 	prime random realloc regex timer url wildmatch \
-	wordsplit str_ctype str_upper bucket conf object sorter \
+	wordsplit str_ctype str_upper str_lower bucket conf object sorter \
 	finger proctitle ipaccess profile bitsig randomkey \
-	hashfunc base64 base224 fb-temp printf fb-mmap
-LIBSH_MOD_PATHS=$(addprefix obj/lib/,$(LIBSH_MODS)) $(CUSTOM_MODULES)
+	hashfunc base64 base224 fb-temp fb-mmap fb-printf urlkey \
+	partmap fb-limfd fb-buffer mainloop exitstatus runcmd carefulio \
+	lizard lizard-safe sighandler buck2obj
+
+ifdef CONFIG_OWN_REGEX
+include lib/regex/Makefile
+endif
+
+LIBSH_MOD_PATHS=$(addprefix obj/lib/,$(LIBSH_MODS)) $(CUSTOM_LIB_MODULES)
 
 obj/lib/libsh.a: $(addsuffix .o,$(LIBSH_MOD_PATHS))
 obj/lib/libsh.so: $(addsuffix .oo,$(LIBSH_MOD_PATHS))
 
 obj/lib/hashfunc.o obj/lib/hashfunc.oo: CFLAGS += -funroll-loops
 
-obj/lib/db-test: obj/lib/db-test.o obj/lib/libsh.$(LS)
-obj/lib/db-tool: obj/lib/db-tool.o obj/lib/libsh.$(LS)
-obj/lib/buckettool: obj/lib/buckettool.o obj/lib/libsh.$(LS)
-obj/lib/conf-test: obj/lib/conf-test.o obj/lib/libsh.$(LS)
-obj/lib/sort-test: obj/lib/sort-test.o obj/lib/libsh.$(LS)
-obj/lib/lfs-test: obj/lib/lfs-test.o obj/lib/libsh.$(LS)
-obj/lib/regex-test: obj/lib/regex-test.o obj/lib/libsh.$(LS)
-obj/lib/hash-test: obj/lib/hash-test.o obj/lib/libsh.$(LS)
-obj/lib/str-test: obj/lib/str-test.o obj/lib/libsh.$(LS)
+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)
+
+obj/lib/lizard.o: CFLAGS += -O6 -funroll-loops
 
 include lib/perl/Makefile
 include lib/shell/Makefile