Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 025d088b8b76646d46f564efa366ed2d3155b609..6f44b008ac232bddf24e1b2b3007f82c692a2202 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,8 @@
-# Makefile for the UCW Library (c) 1997--2006 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
 CONFIGS+=library
+LIBUCW=$(o)/lib/libucw.pc
 
 ifdef CONFIG_UCW_DBTOOL
 PROGS+=$(o)/lib/db-tool
@@ -9,15 +10,15 @@ endif
 
 LIBUCW_MODS= \
        threads \
-       alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt \
+       alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \
        mmap pagecache partmap hashfunc \
-       lists slists simple-lists sorter bitsig \
+       lists slists simple-lists bitsig \
        log log-file proctitle \
        conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \
        ipaccess \
        profile \
        fastbuf ff-binary ff-string ff-printf ff-utf8 \
-       fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-atomic \
+       fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param \
        str_ctype str_upper str_lower unicode-utf8 stkstring \
        wildmatch wordsplit ctmatch patimatch patmatch regex \
        prime primetable random timer randomkey \
@@ -37,7 +38,7 @@ LIBUCW_MODS= \
 LIBUCW_INCLUDES= \
        lib.h config.h threads.h \
        mempool.h pagecache.h \
-       sorter.h sorter-globals.h arraysort.h \
+       arraysort.h \
        lists.h clists.h slists.h simple-lists.h \
        unaligned.h prefetch.h \
        bbuf.h gbuf.h bitarray.h bitsig.h \
@@ -63,8 +64,8 @@ LIBUCW_INCLUDES= \
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
-LIBUCW_MODS+=threads-conf workqueue
-LIBUCW_INCLUDES+=workqueue.h semaphore.h
+LIBUCW_MODS+=threads-conf workqueue asio fb-direct
+LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
 endif
 
 ifdef CONFIG_OWN_REGEX
@@ -75,7 +76,8 @@ ifdef CONFIG_OWN_GETOPT
 include $(s)/lib/getopt/Makefile
 endif
 
-LIBUCW=$(o)/lib/libucw.pc
+include $(s)/lib/sorter/Makefile
+
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 
 $(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
@@ -87,7 +89,6 @@ $(o)/lib/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 $(o)/lib/db-test: $(o)/lib/db-test.o $(LIBUCW)
 $(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
 $(o)/lib/conf-test: $(o)/lib/conf-test.o $(LIBUCW)
-$(o)/lib/sort-test: $(o)/lib/sort-test.o $(LIBUCW)
 $(o)/lib/lfs-test: $(o)/lib/lfs-test.o $(LIBUCW)
 $(o)/lib/hash-test: $(o)/lib/hash-test.o $(LIBUCW)
 $(o)/lib/str-test: $(o)/lib/str-test.o $(LIBUCW)
@@ -99,7 +100,7 @@ $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
 $(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 
 TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test \
-    slists.test kmp-test.test bbuf.test getopt.test)
+    slists.test kmp-test.test bbuf.test getopt.test fastbuf.test eltpool.test)
 
 $(o)/lib/regex.test: $(o)/lib/regex-t
 $(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
@@ -111,13 +112,18 @@ $(o)/lib/slists.test: $(o)/lib/slists-t
 $(o)/lib/kmp-test.test: $(o)/lib/kmp-test
 $(o)/lib/bbuf.test: $(o)/lib/bbuf-t
 $(o)/lib/getopt.test: $(o)/lib/getopt-t
+$(o)/lib/fastbuf.test: $(o)/lib/fb-file-t $(o)/lib/fb-grow-t $(o)/lib/fb-pool-t
+$(o)/lib/eltpool.test: $(o)/lib/eltpool-t
+
+ifdef CONFIG_UCW_THREADS
+TESTS+=$(addprefix $(o)/lib/,asio.test)
+$(o)/lib/asio.test: $(o)/lib/asio-t
+endif
 
 API_LIBS+=libucw
 API_INCLUDES+=$(o)/lib/.include-stamp
-# XXX: We do not have a dependency on autoconf.h, but it is generated by configure
-# before make ever starts, so this is safe.
-$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-       $(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
+$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES)) obj/autoconf.h
+       $(Q)$(s)/build/install-includes $(<D) run/include/lib $(LIBUCW_INCLUDES)
        $(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
        $(Q)touch $@
 run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc