X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=2a5548704f52c9b3957fbbb17032d7abf5be7133;hb=23d048bf93916d08a87b41533012a36e25de3d2f;hp=8535b6873f419d34ea4ed7cbbfd48cda744ca1a2;hpb=06e407148505bb6f8fb92592d8484062362256ef;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 8535b687..2a554870 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,11 +9,12 @@ endif
 LIBUCW_MODS= \
 	alloc alloc_str realloc mempool mempool-str mempool-fmt \
 	mmap pagecache partmap hashfunc \
-	lists slists sorter bitsig kmp \
+	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 \
+	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 \
@@ -26,7 +27,8 @@ LIBUCW_MODS= \
 	md5 md5hex \
 	base64 base224 \
 	sync \
-	qache
+	qache \
+	string
 
 LIBUCW_INCLUDES= \
 	lib.h config.h math.h \
@@ -38,7 +40,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 \
@@ -75,8 +77,10 @@ $(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)
+TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test slists.test kmp-test.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
@@ -84,10 +88,12 @@ $(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
 
 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