X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=174e51b27d1bc44d947bd550986f77d8031fb2d7;hb=6bdaf40528a6961e089bb58ecb52a12a41c6a439;hp=327581ef92269d2c2fd0a702500bf41ba0d49ce6;hpb=924fc6746e5297e749b6272f89d9c6abcd2c316b;p=libucw.git

diff --git a/ucw/Makefile b/ucw/Makefile
index 327581ef..174e51b2 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the UCW Library (c) 1997--2009 Martin Mares <mj@ucw.cz>
+# Makefile for the UCW Library (c) 1997--2010 Martin Mares <mj@ucw.cz>
 
 DIRS+=ucw
 LIBUCW=$(o)/ucw/libucw.pc
@@ -23,14 +23,15 @@ LIBUCW_MODS= \
 	prime primetable random timer randomkey \
 	bit-ffs bit-fls \
 	url \
-	mainloop exitstatus runcmd sighandler \
+	mainloop main-block \
+	exitstatus runcmd sighandler \
 	lizard lizard-safe adler32 \
 	md5 sha1 sha1-hmac \
 	base64 base224 \
 	sync \
 	qache \
 	string str-esc str-split str-match str-imatch str-hex \
-	bbuf \
+	bbuf gary \
 	getopt \
 	strtonum
 
@@ -41,7 +42,7 @@ LIBUCW_MAIN_INCLUDES= \
 	string.h stkstring.h unicode.h chartype.h regex.h \
 	wildmatch.h \
 	unaligned.h prefetch.h \
-	bbuf.h gbuf.h bitarray.h bitsig.h \
+	bbuf.h gbuf.h gary.h bitarray.h bitsig.h \
 	hashfunc.h hashtable.h \
 	heap.h binheap.h binheap-node.h \
 	redblack.h \
@@ -85,6 +86,10 @@ $(o)/ucw/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
 $(o)/ucw/libucw-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/ucw/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 
+ifdef CONFIG_STATIC_PIC
+$(o)/ucw/libucw.pc: $(o)/ucw/libucw-pic.a
+endif
+
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
 $(o)/ucw/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
@@ -108,7 +113,8 @@ TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test
     slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test eltpool.test \
     fb-socket.test trie-test.test string.test sha1.test asort-test.test binheap-test.test \
     redblack-test.test fb-file.test fb-grow.test fb-pool.test fb-atomic.test \
-    fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test url.test strtonum-test.test)
+    fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test url.test strtonum-test.test \
+    gary.test)
 
 $(o)/ucw/regex.test: $(o)/ucw/regex-t
 $(o)/ucw/unicode.test: $(o)/ucw/unicode-t
@@ -132,6 +138,7 @@ $(o)/ucw/strtonum-test.test: $(o)/ucw/strtonum-test
 $(addprefix $(o)/ucw/fb-,file.test grow.test pool.test socket.test atomic.test \
 	limfd.test temp.test mem.test buffer.test mmap.test): %.test: %-t
 $(o)/ucw/url.test: $(o)/ucw/url-t
+$(o)/ucw/gary.test: $(o)/ucw/gary-t
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/ucw/,asio.test)
@@ -168,6 +175,9 @@ install-libucw:
 	install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
 	install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	install -m 644 run/lib/libucw.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
+ifdef CONFIG_STATIC_PIC
+	install -m 644 run/lib/libucw-pic.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
+endif
 	install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 .PHONY: install-libucw