X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile;h=c204d6e664ea8cdcd22b7e4d15395b4ecf5da507;hb=1f05348cde42852d77da3457b96a33dff1600ca4;hp=37a1e7fc9417daf3719117e5a0a96d1162659b7e;hpb=54833f693e97cc4c3d5b8c28e6816e8d1ce5192e;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 37a1e7fc..c204d6e6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,8 @@
 # Makefile for the UCW Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
-LIBUCW=$(o)/lib/libucw.$(LS)
+CONFIGS+=library
+LIBUCW=$(o)/lib/libucw.pc
 
 ifdef CONFIG_UCW_DBTOOL
 PROGS+=$(o)/lib/db-tool
@@ -9,7 +10,7 @@ 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 \
 	log log-file proctitle \
@@ -63,7 +64,6 @@ LIBUCW_INCLUDES= \
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
-LIBS+=-lpthread
 LIBUCW_MODS+=threads-conf workqueue asio fb-direct
 LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
 endif
@@ -78,7 +78,6 @@ endif
 
 include $(s)/lib/sorter/Makefile
 
-LIBUCW=$(o)/lib/libucw.pc
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 
 $(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
@@ -102,7 +101,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 fastbuf.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
@@ -115,6 +114,7 @@ $(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)
@@ -123,10 +123,10 @@ 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)
-	# XXX: We do not have a dependency on autoconf.h, but it is generated by configure
-	# before make ever starts, so this is safe.
 	$(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
 	$(Q)touch $@
 run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc