X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=d884ffb059ad55107f4ee98013f704243c0f9e71;hb=f635f4d406f772b54455331cdf23cc10a361392a;hp=b8150ec160813f838b82054631a7cdcf7b2aeb26;hpb=14551d39386ee81bfd1422be4bb18e41d2e4ef95;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index b8150ec1..d884ffb0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,23 +1,26 @@
-# 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
 
 ifdef CONFIG_UCW_DBTOOL
-PROGS+=obj/lib/db-tool
+PROGS+=$(o)/lib/db-tool
 endif
 
 LIBUCW_MODS= \
-	alloc alloc_str realloc mempool mempool-str mempool-fmt \
+	threads \
+	alloc alloc_str realloc bigalloc 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 fb-atomic \
 	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,19 +28,22 @@ LIBUCW_MODS= \
 	md5 md5hex \
 	base64 base224 \
 	sync \
-	qache
+	qache \
+	string \
+	bbuf \
+	getopt
 
 LIBUCW_INCLUDES= \
-	lib.h config.h math.h \
+	lib.h config.h threads.h math.h \
 	mempool.h pagecache.h \
-	sorter.h arraysort.h \
+	sorter.h sorter-globals.h arraysort.h \
 	lists.h clists.h \
 	unaligned.h prefetch.h \
 	bbuf.h gbuf.h bitarray.h bitsig.h \
 	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 \
@@ -48,49 +54,71 @@ LIBUCW_INCLUDES= \
 	lizard.h \
 	md5.h \
 	base64.h base224.h \
-	qache.h
+	qache.h \
+	kmp.h kmp-search.h binsearch.h
+
+ifdef CONFIG_UCW_THREADS
+# Some modules require threading
+LIBS+=-lpthread
+LIBUCW_MODS+=threads-conf workqueue
+LIBUCW_INCLUDES+=workqueue.h
+endif
 
 ifdef CONFIG_OWN_REGEX
-include lib/regex/Makefile
+include $(s)/lib/regex/Makefile
 endif
 
-LIBUCW=obj/lib/libucw.$(LS)
-LIBUCW_MOD_PATHS=$(addprefix obj/lib/,$(LIBUCW_MODS))
-
-obj/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
-obj/lib/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
-
-obj/lib/hashfunc.o obj/lib/hashfunc.oo: CFLAGS += -funroll-loops
-obj/lib/lizard.o: CFLAGS += -O6 -funroll-loops
-
-obj/lib/db-test: obj/lib/db-test.o $(LIBUCW)
-obj/lib/db-tool: obj/lib/db-tool.o $(LIBUCW)
-obj/lib/conf-test: obj/lib/conf-test.o $(LIBUCW)
-obj/lib/sort-test: obj/lib/sort-test.o $(LIBUCW)
-obj/lib/lfs-test: obj/lib/lfs-test.o $(LIBUCW)
-obj/lib/hash-test: obj/lib/hash-test.o $(LIBUCW)
-obj/lib/str-test: obj/lib/str-test.o $(LIBUCW)
-obj/lib/asort-test: obj/lib/asort-test.o $(LIBUCW)
-obj/lib/redblack-test: obj/lib/redblack-test.o $(LIBUCW)
-obj/lib/binheap-test: obj/lib/binheap-test.o $(LIBUCW)
-obj/lib/lizard-test: obj/lib/lizard-test.o $(LIBUCW)
-
-TESTS+=$(addprefix obj/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test)
-obj/lib/regex.test: obj/lib/regex-t
-obj/lib/unicode-utf8.test: obj/lib/unicode-utf8-t
-obj/lib/hash-test.test: obj/lib/hash-test
-obj/lib/mempool.test: obj/lib/mempool-fmt-t obj/lib/mempool-str-t
-obj/lib/stkstring.test: obj/lib/stkstring-t
-
-INCLUDES+=obj/lib/.include-stamp
-obj/lib/.include-stamp: $(addprefix lib/,$(LIBUCW_INCLUDES))
-	build/install-includes lib run/include/lib $(?F)
-	touch obj/lib/.include-stamp
+ifdef CONFIG_OWN_GETOPT
+include $(s)/lib/getopt/Makefile
+endif
+
+LIBUCW=$(o)/lib/libucw.$(LS)
+LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
+
+$(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 += $(COPT2) -funroll-loops
+
+$(o)/lib/db-test: $(o)/lib/db-test.o $(LIBUCW)
+$(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
+$(o)/lib/conf-test: $(o)/lib/conf-test.o $(LIBUCW)
+$(o)/lib/sort-test: $(o)/lib/sort-test.o $(LIBUCW)
+$(o)/lib/lfs-test: $(o)/lib/lfs-test.o $(LIBUCW)
+$(o)/lib/hash-test: $(o)/lib/hash-test.o $(LIBUCW)
+$(o)/lib/str-test: $(o)/lib/str-test.o $(LIBUCW)
+$(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 \
+    slists.test kmp-test.test bbuf.test getopt.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-t $(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
+$(o)/lib/getopt.test: $(o)/lib/getopt-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
-include lib/perl/Makefile
+include $(s)/lib/perl/Makefile
 endif
 
 ifdef CONFIG_UCW_SHELL_UTILS
-include lib/shell/Makefile
+include $(s)/lib/shell/Makefile
 endif