Logging: Following streams by stderr is now configurable.

[libucw.git] / ucw / Makefile

diff --git a/ucw/Makefile b/ucw/Makefile
index 27d0635f0c498e57367622a8ffd9c14e77a7ccb0..a696e7a74862d6b592dfa6734660207036435f72 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the UCW Library (c) 1997--2008 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Library (c) 1997--2009 Martin Mares <mj@ucw.cz>
 
 DIRS+=ucw
 LIBUCW=$(o)/ucw/libucw.pc
@@ -12,7 +12,7 @@ LIBUCW_MODS= \
        alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \
        mmap partmap hashfunc \
        slists simple-lists bitsig \
-       log log-file proctitle \
+       log log-stream log-file log-syslog log-conf proctitle tbf \
        conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
        ipaccess \
        profile \
@@ -60,10 +60,14 @@ LIBUCW_MAIN_INCLUDES= \
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
-LIBUCW_MODS+=threads-conf workqueue asio fb-direct
+LIBUCW_MODS+=threads-conf workqueue asio
 LIBUCW_MAIN_INCLUDES+=workqueue.h semaphore.h asio.h
 endif
 
+ifdef CONFIG_UCW_FB_DIRECT
+LIBUCW_MODS+=fb-direct
+endif
+
 ifdef CONFIG_OWN_GETOPT
 include $(s)/ucw/getopt/Makefile
 endif
@@ -90,12 +94,15 @@ $(o)/ucw/asort-test: $(o)/ucw/asort-test.o $(LIBUCW)
 $(o)/ucw/redblack-test: $(o)/ucw/redblack-test.o $(LIBUCW)
 $(o)/ucw/binheap-test: $(o)/ucw/binheap-test.o $(LIBUCW)
 $(o)/ucw/lizard-test: $(o)/ucw/lizard-test.o $(LIBUCW)
-$(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW) $(LIBCHARSET)
+$(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW)
+ifdef CONFIG_CHARSET
+$(o)/ucw/kmp-test: $(LIBCHARSET)
+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 kmp-test.test bbuf.test getopt.test ff-unicode.test eltpool.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)