X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2FMakefile;h=174e51b27d1bc44d947bd550986f77d8031fb2d7;hb=6bdaf40528a6961e089bb58ecb52a12a41c6a439;hp=5c328ca413a76513534b6579d2f0c58dc09ffec6;hpb=e938d9e3bf5c98b502178ee26d81a410890fb725;p=libucw.git diff --git a/ucw/Makefile b/ucw/Makefile index 5c328ca4..174e51b2 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -1,4 +1,4 @@ -# Makefile for the UCW Library (c) 1997--2008 Martin Mares +# Makefile for the UCW Library (c) 1997--2010 Martin Mares DIRS+=ucw LIBUCW=$(o)/ucw/libucw.pc @@ -12,7 +12,7 @@ LIBUCW_MODS= \ alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \ mmap partmap hashfunc \ slists simple-lists bitsig \ - log log-file proctitle \ + log log-stream log-file log-syslog log-conf proctitle tbf \ conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \ ipaccess \ profile \ @@ -23,25 +23,26 @@ 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 \ - getopt + bbuf gary \ + getopt \ + strtonum LIBUCW_MAIN_INCLUDES= \ - lib.h threads.h \ + lib.h log.h threads.h \ mempool.h \ - arraysort.h \ clists.h slists.h simple-lists.h \ 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 \ @@ -57,14 +58,19 @@ LIBUCW_MAIN_INCLUDES= \ base64.h base224.h \ qache.h \ kmp.h kmp-search.h binsearch.h \ - partmap.h + partmap.h \ + strtonum.h ifdef CONFIG_UCW_THREADS # Some modules require threading -LIBUCW_MODS+=threads-conf workqueue asio fb-direct +LIBUCW_MODS+=threads-conf workqueue asio LIBUCW_MAIN_INCLUDES+=workqueue.h semaphore.h asio.h endif +ifdef CONFIG_UCW_FB_DIRECT +LIBUCW_MODS+=fb-direct +endif + ifdef CONFIG_OWN_GETOPT include $(s)/ucw/getopt/Makefile endif @@ -77,8 +83,13 @@ include $(s)/ucw/doc/Makefile LIBUCW_MOD_PATHS=$(addprefix $(o)/ucw/,$(LIBUCW_MODS)) $(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 @@ -90,15 +101,20 @@ $(o)/ucw/asort-test: $(o)/ucw/asort-test.o $(LIBUCW) $(o)/ucw/redblack-test: $(o)/ucw/redblack-test.o $(LIBUCW) $(o)/ucw/binheap-test: $(o)/ucw/binheap-test.o $(LIBUCW) $(o)/ucw/lizard-test: $(o)/ucw/lizard-test.o $(LIBUCW) -$(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW) $(LIBCHARSET) +$(o)/ucw/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW) +$(o)/ucw/strtonum-test: $(o)/ucw/strtonum-test.o $(LIBUCW) +ifdef CONFIG_CHARSET +$(o)/ucw/kmp-test: $(LIBCHARSET) +endif $(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW) $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW) TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \ - slists.test kmp-test.test bbuf.test getopt.test ff-unicode.test eltpool.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) + 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 @@ -118,9 +134,11 @@ $(o)/ucw/trie-test.test: $(o)/ucw/trie-test $(o)/ucw/asort-test.test: $(o)/ucw/asort-test $(o)/ucw/binheap-test.test: $(o)/ucw/binheap-test $(o)/ucw/redblack-test.test: $(o)/ucw/redblack-test +$(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) @@ -135,8 +153,8 @@ endif API_LIBS+=libucw API_INCLUDES+=$(o)/ucw/.include-stamp $(o)/ucw/.include-stamp: $(addprefix $(s)/ucw/,$(LIBUCW_INCLUDES)) $(o)/ucw/autoconf.h - $(Q)$(s)/build/install-includes $(/' <$(s)/ucw/config.h >run/include/ucw/config.h $(Q)touch $@ run/lib/pkgconfig/libucw.pc: $(o)/ucw/libucw.pc @@ -149,12 +167,17 @@ ifdef CONFIG_UCW_SHELL_UTILS include $(s)/ucw/shell/Makefile endif +CONFIGS+=libucw + INSTALL_TARGETS+=install-libucw install-libucw: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) $(DESTDIR)$(INSTALL_CONFIG_DIR) 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) - install -m 644 run/cf/libucw $(DESTDIR)$(INSTALL_CONFIG_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