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

diff --git a/ucw/Makefile b/ucw/Makefile
index 27a7ac83..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 \
@@ -58,20 +58,18 @@ LIBUCW_MAIN_INCLUDES= \
 	kmp.h kmp-search.h binsearch.h \
 	partmap.h
 
-export LIBUCW_LIBS=
-
 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_OWN_GETOPT
-include $(s)/ucw/getopt/Makefile
+ifdef CONFIG_UCW_FB_DIRECT
+LIBUCW_MODS+=fb-direct
 endif
 
-ifdef CONFIG_PCRE
-LIBUCW_LIBS+=-lpcre
+ifdef CONFIG_OWN_GETOPT
+include $(s)/ucw/getopt/Makefile
 endif
 
 LIBUCW_INCLUDES=$(LIBUCW_MAIN_INCLUDES)