X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=ad93507dacf6dd896bd95e777525889f917e94a4;hb=3ddf73130fa4c00ec2c685e80ea68c5f46039739;hp=273e3fda9bf27b83c5126a595fc6c553fe110516;hpb=55af8091a6e05675a50ff1d599506e6f1a9cde99;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 273e3fda..ad93507d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -3,23 +3,28 @@
 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 custom.o base224.o fb-temp.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
+LIBSH_MOD_PATHS=$(addprefix obj/lib/,$(LIBSH_MODS)) $(CUSTOM_MODULES)
 
-obj/lib/libsh.a: $(addprefix obj/lib/,$(SHLIB_OBJS))
+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 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)
+
+include lib/perl/Makefile
+include lib/shell/Makefile