X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2FMakefile;h=4c447281ad87c8e5ce8e400d91f17f3c528e097b;hb=e371dcc1cd2857036374dd9597705faed0427006;hp=356391e5a9d3e832cbb2ccd01a1110a1908055d1;hpb=c460be258f74353287bb852c37c7782a0322a3c0;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 356391e5..4c447281 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,16 +10,16 @@ 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-pool fb-atomic fb-param \
-	str_ctype str_upper str_lower unicode-utf8 stkstring \
+	fastbuf ff-binary ff-string ff-printf ff-unicode \
+	fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket \
+	str_ctype str_upper str_lower unicode stkstring \
 	wildmatch wordsplit ctmatch patimatch patmatch regex \
 	prime primetable random timer randomkey \
 	bit-ffs bit-fls \
@@ -35,9 +36,9 @@ LIBUCW_MODS= \
 	getopt
 
 LIBUCW_INCLUDES= \
-	lib.h config.h threads.h math.h \
+	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 \
@@ -48,7 +49,7 @@ LIBUCW_INCLUDES= \
 	bitops.h \
 	conf.h getopt.h ipaccess.h \
 	profile.h \
-	fastbuf.h lfs.h ff-utf8.h ff-binary.h \
+	fastbuf.h lfs.h ff-unicode.h ff-utf8.h ff-binary.h \
 	chartype.h unicode.h stkstring.h \
 	wildmatch.h patmatch.h \
 	db.h \
@@ -58,12 +59,11 @@ LIBUCW_INCLUDES= \
 	md5.h \
 	base64.h base224.h \
 	qache.h \
-	kmp.h kmp-search.h \
+	kmp.h kmp-search.h binsearch.h \
 	partmap.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 +78,6 @@ endif
 
 include $(s)/lib/sorter/Makefile
 
-LIBUCW=$(o)/lib/libucw.$(LS)
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 
 $(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
@@ -90,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)
@@ -101,11 +99,12 @@ $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW)
 $(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)
+TESTS+=$(addprefix $(o)/lib/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
+    slists.test kmp-test.test bbuf.test getopt.test fastbuf.test ff-unicode.test eltpool.test \
+    fb-socket.test)
 
 $(o)/lib/regex.test: $(o)/lib/regex-t
-$(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
+$(o)/lib/unicode.test: $(o)/lib/unicode-t
 $(o)/lib/hash-test.test: $(o)/lib/hash-test
 $(o)/lib/mempool.test: $(o)/lib/mempool-t $(o)/lib/mempool-fmt-t $(o)/lib/mempool-str-t
 $(o)/lib/stkstring.test: $(o)/lib/stkstring-t
@@ -115,17 +114,22 @@ $(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/ff-unicode.test: $(o)/lib/ff-unicode-t
+$(o)/lib/eltpool.test: $(o)/lib/eltpool-t
+$(o)/lib/fb-socket.test: $(o)/lib/fb-socket-t
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/lib/,asio.test)
 $(o)/lib/asio.test: $(o)/lib/asio-t
 endif
 
-INCLUDES+=$(o)/lib/.include-stamp
-$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-	$(s)/build/install-includes $(s)/lib run/include/lib $(?F)
-	$(s)/build/install-includes $(o)/lib run/include/lib autoconf.h
-	touch $(o)/lib/.include-stamp
+API_LIBS+=libucw
+API_INCLUDES+=$(o)/lib/.include-stamp
+$(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
 
 ifdef CONFIG_UCW_PERL
 include $(s)/lib/perl/Makefile