X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile;h=7bb2c7c473ff5c61248f70bae9ef649bf0e9d6f8;hb=3f852dbf02d4a71de5470885e57b11726ad5ac77;hp=759c2d0d690a85aece38dfe9d59869da0542af39;hpb=9b2d0bbed694a76120ff1315060cdc587c38f18a;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 759c2d0d..7bb2c7c4 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,28 +1,34 @@
-# Makefile for the Sherlock Library (c) 1997--2002 Martin Mares <mj@ucw.cz>
+# Makefile for the Sherlock Library (c) 1997--2003 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
 PROGS+=obj/lib/db-tool obj/lib/buckettool
 
-SHLIB_OBJS=alloc.o alloc_str.o ctmatch.o db.o fastbuf.o fb-file.o fb-mem.o lists.o \
-	log.o log2.o md5.o md5hex.o mmap.o pagecache.o patimatch.o patmatch.o pool.o \
-	prime.o random.o realloc.o regex.o timer.o url.o wildmatch.o \
-	wordsplit.o str_ctype.o str_upper.o bucket.o conf.o object.o sorter.o \
-	finger.o proctitle.o ipaccess.o profile.o bitsig.o randomkey.o \
-	hashfunc.o base64.o base224.o fb-temp.o printf.o fb-mmap.o
+LIBSH_MODS=alloc alloc_str ctmatch db fastbuf fb-file fb-mem lists \
+	log log2 md5 md5hex mmap pagecache patimatch patmatch pool \
+	prime random realloc regex timer url wildmatch \
+	wordsplit str_ctype str_upper bucket conf object sorter \
+	finger proctitle ipaccess profile bitsig randomkey \
+	hashfunc base64 base224 fb-temp fb-mmap fb-printf urlkey \
+	partmap fb-limfd fb-buffer
+LIBSH_MOD_PATHS=$(addprefix obj/lib/,$(LIBSH_MODS)) $(CUSTOM_LIB_MODULES)
 
-obj/lib/libsh.a: $(addprefix obj/lib/,$(SHLIB_OBJS)) $(CUSTOM_MODULES)
+obj/lib/libsh.a: $(addsuffix .o,$(LIBSH_MOD_PATHS))
+obj/lib/libsh.so: $(addsuffix .oo,$(LIBSH_MOD_PATHS))
 
-obj/lib/hashfunc.o: CFLAGS += -funroll-loops
+obj/lib/hashfunc.o obj/lib/hashfunc.oo: CFLAGS += -funroll-loops
 
-obj/lib/db-test: obj/lib/db-test.o obj/lib/libsh.a
-obj/lib/db-tool: obj/lib/db-tool.o obj/lib/libsh.a
-obj/lib/buckettool: obj/lib/buckettool.o obj/lib/libsh.a
-obj/lib/conf-test: obj/lib/conf-test.o obj/lib/libsh.a
-obj/lib/sort-test: obj/lib/sort-test.o obj/lib/libsh.a
-obj/lib/lfs-test: obj/lib/lfs-test.o obj/lib/libsh.a
-obj/lib/regex-test: obj/lib/regex-test.o obj/lib/libsh.a
-obj/lib/hash-test: obj/lib/hash-test.o obj/lib/libsh.a
-obj/lib/str-test: obj/lib/str-test.o obj/lib/libsh.a
+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/regex-test: obj/lib/regex-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)
 
 include lib/perl/Makefile
 include lib/shell/Makefile