Bitarray: Counting of bits and other fixes

[libucw.git] / ucw / Makefile

diff --git a/ucw/Makefile b/ucw/Makefile
index 54fce8d1f33a441d62d83bac4ad007a6ea6c4fb9..d4a055ce1982cf0310088871a8c7aac49e90b237 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -13,30 +13,33 @@ LIBUCW_MODS= \
        partmap hashfunc \
        slists simple-lists bitsig \
        log log-stream log-file log-syslog log-conf tbf \
-       conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
+       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 \
-       fb-file fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket \
+       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 \
        wildmatch regex \
-       prime primetable random timer \
-       bit-ffs bit-fls \
+       prime primetable random \
+       time-stamp time-timer time-conf \
+       bit-ffs bit-fls bit-count \
        url \
        mainloop main-block main-rec \
        proctitle exitstatus runcmd \
        lizard lizard-safe adler32 sighandler \
-       md5 sha1 sha1-hmac \
+       md5 sha1 sha1-hmac crc crc-tables \
        base64 base224 \
        io-careful io-sync io-mmap io-size \
        string str-esc str-split str-match str-imatch str-hex str-fix \
        bbuf gary \
        getopt \
        strtonum \
-       resource trans res-fd res-mem res-subpool res-mempool res-eltpool
+       resource trans res-fd res-mem res-subpool res-mempool res-eltpool \
+       daemon daemon-ctrl \
+       signames
 
 LIBUCW_MAIN_INCLUDES= \
-       lib.h log.h threads.h \
-       mempool.h \
+       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 \
        wildmatch.h \
@@ -53,12 +56,14 @@ LIBUCW_MAIN_INCLUDES= \
        mainloop.h \
        process.h \
        lizard.h \
-       md5.h sha1.h \
+       md5.h sha1.h crc.h \
        base64.h base224.h \
        kmp.h kmp-search.h binsearch.h \
        partmap.h \
        strtonum.h \
-       resource.h trans.h
+       resource.h trans.h \
+       daemon.h \
+       signames.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -70,7 +75,7 @@ ifdef CONFIG_UCW_FB_DIRECT
 LIBUCW_MODS+=fb-direct
 endif
 
-ifdef CONFIG_OWN_GETOPT
+ifdef CONFIG_UCW_OWN_GETOPT
 include $(s)/ucw/getopt/Makefile
 endif
 
@@ -93,7 +98,6 @@ $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
 $(o)/ucw/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
 $(o)/ucw/conf-test: $(o)/ucw/conf-test.o $(LIBUCW)
-$(o)/ucw/lfs-test: $(o)/ucw/lfs-test.o $(LIBUCW)
 $(o)/ucw/hash-test: $(o)/ucw/hash-test.o $(LIBUCW)
 $(o)/ucw/hashfunc-test: $(o)/ucw/hashfunc-test.o $(LIBUCW)
 $(o)/ucw/asort-test: $(o)/ucw/asort-test.o $(LIBUCW)
@@ -112,15 +116,15 @@ TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test
     slists.test bbuf.test kmp-test.test getopt.test ff-unicode.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 url.test strtonum-test.test \
-    gary.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 signames.test md5.test)
 
 $(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
@@ -135,9 +139,13 @@ $(o)/ucw/binheap-test.test: $(o)/ucw/binheap-test
 $(o)/ucw/redblack-test.test: $(o)/ucw/redblack-test
 $(o)/ucw/strtonum-test.test: $(o)/ucw/strtonum-test
 $(addprefix $(o)/ucw/fb-,file.test grow.test pool.test socket.test atomic.test \
-       limfd.test temp.test mem.test buffer.test mmap.test): %.test: %-t
+       limfd.test temp.test mem.test buffer.test mmap.test multi.test): %.test: %-t
 $(o)/ucw/url.test: $(o)/ucw/url-t
 $(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
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/ucw/,asio.test)