X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=ccfc20ce972dc505b94e99f1d0376ae672a63e92;hb=003ca21e49148941c07f69c87e2553f660913b65;hp=71e2817bcfafb45f03a7df3663fbb3ce650aea69;hpb=d47a6902d066cd934655e0993ccb173dc1e25388;p=libucw.git

diff --git a/ucw/Makefile b/ucw/Makefile
index 71e2817b..ccfc20ce 100644
--- 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 \
 	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
@@ -76,6 +80,7 @@ include $(s)/ucw/doc/Makefile
 LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS))
 
 $(o)/ucw/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
+$(o)/ucw/libucw-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/ucw/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
@@ -89,7 +94,10 @@ $(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)