X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile;h=554bfad940253d1f5e2241732483211d77247cdf;hb=487f19b958da5875f0c05e53d5c229874662735e;hp=a17efb2e56d5ccd1158e05fd2512ef90e11a1240;hpb=136c4f2fe9e1b7df2929c240e5a94973f596a259;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index a17efb2e..554bfad9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the UCW Library (c) 1997--2004 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Library (c) 1997--2006 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
 
@@ -9,15 +9,17 @@ endif
 LIBUCW_MODS= \
 	alloc alloc_str realloc mempool mempool-str mempool-fmt \
 	mmap pagecache partmap hashfunc \
-	lists sorter bitsig \
+	lists slists simple-lists sorter bitsig \
 	log log-file proctitle \
-	conf ipaccess \
+	conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
+	ipaccess \
 	profile \
-	fastbuf ff-printf ff-utf8 \
-	fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer \
+	fastbuf ff-binary ff-string ff-printf ff-utf8 \
+	fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow \
 	str_ctype str_upper str_lower unicode-utf8 stkstring \
 	wildmatch wordsplit ctmatch patimatch patmatch regex \
-	prime random timer log2 randomkey \
+	prime primetable random timer randomkey \
+	bit-ffs bit-fls \
 	db \
 	url \
 	mainloop exitstatus runcmd sighandler \
@@ -25,7 +27,9 @@ LIBUCW_MODS= \
 	md5 md5hex \
 	base64 base224 \
 	sync \
-	qache
+	qache \
+	string \
+	bbuf
 
 LIBUCW_INCLUDES= \
 	lib.h config.h math.h \
@@ -37,7 +41,7 @@ LIBUCW_INCLUDES= \
 	hashfunc.h hashtable.h \
 	heap.h binheap.h binheap-node.h \
 	redblack.h \
-	conf.h ipaccess.h \
+	conf.h getopt.h ipaccess.h \
 	profile.h \
 	fastbuf.h lfs.h ff-utf8.h \
 	chartype.h unicode.h stkstring.h \
@@ -61,7 +65,7 @@ $(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
 $(o)/lib/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 
 $(o)/lib/hashfunc.o $(o)/lib/hashfunc.oo: CFLAGS += -funroll-loops
-$(o)/lib/lizard.o: CFLAGS += -O6 -funroll-loops
+$(o)/lib/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
 $(o)/lib/db-test: $(o)/lib/db-test.o $(LIBUCW)
 $(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
@@ -74,17 +78,24 @@ $(o)/lib/asort-test: $(o)/lib/asort-test.o $(LIBUCW)
 $(o)/lib/redblack-test: $(o)/lib/redblack-test.o $(LIBUCW)
 $(o)/lib/binheap-test: $(o)/lib/binheap-test.o $(LIBUCW)
 $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW)
+$(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
+$(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 
-TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test)
+TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test kmp-test.test bbuf.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
+$(o)/lib/kmp-test.test: $(o)/lib/kmp-test
+$(o)/lib/bbuf.test: $(o)/lib/bbuf-t
 
 INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
 	$(s)/build/install-includes $(s)/lib run/include/lib $(?F)
+	$(s)/build/install-includes $(o)/lib run/include/lib autoconf.h
 	touch $(o)/lib/.include-stamp
 
 ifdef CONFIG_UCW_PERL