X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=d19182736404f3e564b1f051b99cef24d203ae16;hb=c0e08a14cb5681faac6bd4b2567fe153f2421273;hp=a09bd1fbdf09f6ef7d63b6cfee697a5ea057b810;hpb=ff024ef68525c123b2cb40b128a3a29d65acb026;p=libucw.git

diff --git a/ucw/Makefile b/ucw/Makefile
index a09bd1fb..d1918273 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -15,13 +15,13 @@ LIBUCW_MODS= \
 	log log-stream log-file log-syslog log-conf tbf \
 	conf-context conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section conf-getopt \
 	ipaccess \
-	fastbuf ff-binary ff-string ff-printf ff-unicode ff-stkstring \
+	fastbuf ff-binary ff-string ff-printf ff-unicode ff-varint ff-stkstring \
 	fb-file fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket fb-multi \
-	char-cat char-upper char-lower unicode stkstring \
+	char-cat char-upper char-lower unicode varint stkstring \
 	wildmatch regex \
 	prime primetable random \
 	time-stamp time-timer time-conf \
-	bit-ffs bit-fls \
+	bit-ffs bit-fls bit-array \
 	url \
 	mainloop main-block main-rec \
 	proctitle exitstatus runcmd \
@@ -35,13 +35,14 @@ LIBUCW_MODS= \
 	strtonum \
 	resource trans res-fd res-mem res-subpool res-mempool res-eltpool \
 	daemon daemon-ctrl \
-	signames
+	signames \
+	opt
 
 LIBUCW_MAIN_INCLUDES= \
 	lib.h log.h threads.h time.h \
 	mempool.h eltpool.h \
 	clists.h slists.h simple-lists.h \
-	string.h stkstring.h unicode.h chartype.h regex.h \
+	string.h stkstring.h unicode.h varint.h chartype.h regex.h \
 	wildmatch.h \
 	unaligned.h \
 	bbuf.h gbuf.h gary.h bitarray.h bitsig.h \
@@ -51,7 +52,7 @@ LIBUCW_MAIN_INCLUDES= \
 	prime.h \
 	bitops.h \
 	conf.h getopt.h ipaccess.h \
-	fastbuf.h io.h ff-unicode.h ff-binary.h \
+	fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h \
 	url.h \
 	mainloop.h \
 	process.h \
@@ -63,7 +64,8 @@ LIBUCW_MAIN_INCLUDES= \
 	strtonum.h \
 	resource.h trans.h \
 	daemon.h \
-	signames.h
+	signames.h \
+	opt.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -97,6 +99,8 @@ endif
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
 $(o)/ucw/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
+$(o)/ucw/ff-varint-t: $(LIBUCW)
+$(o)/ucw/varint-t: $(LIBUCW)
 $(o)/ucw/conf-test: $(o)/ucw/conf-test.o $(LIBUCW)
 $(o)/ucw/hash-test: $(o)/ucw/hash-test.o $(LIBUCW)
 $(o)/ucw/hashfunc-test: $(o)/ucw/hashfunc-test.o $(LIBUCW)
@@ -112,24 +116,26 @@ endif
 $(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW)
 $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
 
-TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
-    slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test eltpool.test \
+TESTS+=$(addprefix $(o)/ucw/,varint.test regex.test unicode.test hash-test.test mempool.test stkstring.test \
+    slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test ff-varint.test eltpool.test \
     fb-socket.test trie-test.test string.test sha1.test asort-test.test binheap-test.test \
     redblack-test.test fb-file.test fb-grow.test fb-pool.test fb-atomic.test \
     fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test fb-multi.test url.test strtonum-test.test \
-    gary.test time.test crc.test)
+    gary.test time.test crc.test signames.test md5.test opt.test)
 
+$(o)/ucw/varint.test: $(o)/ucw/varint-t
 $(o)/ucw/regex.test: $(o)/ucw/regex-t
 $(o)/ucw/unicode.test: $(o)/ucw/unicode-t
 $(o)/ucw/hash-test.test: $(o)/ucw/hash-test
 $(o)/ucw/mempool.test: $(o)/ucw/mempool-t $(o)/ucw/mempool-fmt-t $(o)/ucw/mempool-str-t
 $(o)/ucw/stkstring.test: $(o)/ucw/stkstring-t
-$(o)/ucw/bitops.test: $(o)/ucw/bit-ffs-t $(o)/ucw/bit-fls-t
+$(o)/ucw/bitops.test: $(o)/ucw/bit-ffs-t $(o)/ucw/bit-fls-t $(o)/ucw/bit-count-t
 $(o)/ucw/slists.test: $(o)/ucw/slists-t
 $(o)/ucw/kmp-test.test: $(o)/ucw/kmp-test
 $(o)/ucw/bbuf.test: $(o)/ucw/bbuf-t
 $(o)/ucw/getopt.test: $(o)/ucw/getopt-t
 $(o)/ucw/ff-unicode.test: $(o)/ucw/ff-unicode-t
+$(o)/ucw/ff-varint.test: $(o)/ucw/ff-varint-t
 $(o)/ucw/eltpool.test: $(o)/ucw/eltpool-t
 $(o)/ucw/string.test: $(o)/ucw/str-hex-t $(o)/ucw/str-esc-t $(o)/ucw/str-fix-t
 $(o)/ucw/sha1.test: $(o)/ucw/sha1-t $(o)/ucw/sha1-hmac-t
@@ -145,6 +151,8 @@ $(o)/ucw/gary.test: $(o)/ucw/gary-t
 $(o)/ucw/time.test: $(o)/ucw/time-conf-t
 $(o)/ucw/crc.test: $(o)/ucw/crc-t
 $(o)/ucw/signames.test: $(o)/ucw/signames-t
+$(o)/ucw/md5.test: $(o)/ucw/md5-t
+$(o)/ucw/opt.test: $(o)/ucw/opt-t
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/ucw/,asio.test)