X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=669f356b152925c7fc69cfa4a9acf64312d85857;hb=e42cd882d7970eb0b01bc9b058e0446996212cb4;hp=814ec251f821949b54f03925aea0fe3f2ce40fb2;hpb=e6f42d16d3278e709f23825944598769539368e5;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 814ec251..669f356b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,7 @@
 
 DIRS+=lib
 CONFIGS+=library
+LIBUCW=$(o)/lib/libucw.pc
 
 ifdef CONFIG_UCW_DBTOOL
 PROGS+=$(o)/lib/db-tool
@@ -9,9 +10,9 @@ 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 \
@@ -32,12 +33,13 @@ LIBUCW_MODS= \
 	qache \
 	string \
 	bbuf \
-	getopt
+	getopt \
+	xml
 
 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 \
@@ -58,12 +60,12 @@ LIBUCW_INCLUDES= \
 	md5.h \
 	base64.h base224.h \
 	qache.h \
-	kmp.h kmp-search.h \
-	partmap.h
+	kmp.h kmp-search.h binsearch.h \
+	partmap.h \
+	xml.h
 
 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 +80,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))
@@ -87,10 +88,14 @@ $(o)/lib/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/lib/hashfunc.o $(o)/lib/hashfunc.oo: CFLAGS += -funroll-loops
 $(o)/lib/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
+$(o)/lib/xml.o: $(o)/lib/xml-ucat.h
+$(o)/lib/xml-ucat.h: $(s)/lib/xml-ucat.pl
+	$(M)GEN $@
+	$(Q)$< >$@
+
 $(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)
@@ -102,7 +107,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 +120,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 +129,8 @@ 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