X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=860a647a497d6852209afb47c0a829cc21aa3db8;hb=395d5c738aebc0d93688eb140cc00ed1a9196ef3;hp=d19182736404f3e564b1f051b99cef24d203ae16;hpb=84d58e01664d047c47f8c95e663d7959aa40464b;p=libucw.git diff --git a/ucw/Makefile b/ucw/Makefile index d1918273..860a647a 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -1,4 +1,4 @@ -# Makefile for the UCW Library (c) 1997--2010 Martin Mares +# Makefile for the UCW Library (c) 1997--2014 Martin Mares DIRS+=ucw LIBUCW=$(o)/ucw/libucw.pc @@ -9,14 +9,15 @@ endif LIBUCW_MODS= \ threads \ - alloc alloc_str realloc bigalloc mempool mempool-str mempool-fmt eltpool \ + alloc alloc_str alloc-std \ + bigalloc mempool mempool-str mempool-fmt eltpool \ partmap hashfunc \ slists simple-lists bitsig \ log log-stream log-file log-syslog log-conf tbf \ conf-context conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section conf-getopt \ ipaccess \ fastbuf ff-binary ff-string ff-printf ff-unicode ff-varint ff-stkstring \ - fb-file fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket fb-multi \ + fb-file fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket fb-multi fb-null \ char-cat char-upper char-lower unicode varint stkstring \ wildmatch regex \ prime primetable random \ @@ -36,11 +37,11 @@ LIBUCW_MODS= \ resource trans res-fd res-mem res-subpool res-mempool res-eltpool \ daemon daemon-ctrl \ signames \ - opt + opt opt-help opt-conf LIBUCW_MAIN_INCLUDES= \ - lib.h log.h threads.h time.h \ - mempool.h eltpool.h \ + lib.h log.h tbf.h threads.h time.h \ + alloc.h mempool.h eltpool.h \ clists.h slists.h simple-lists.h \ string.h stkstring.h unicode.h varint.h chartype.h regex.h \ wildmatch.h \ @@ -52,19 +53,20 @@ LIBUCW_MAIN_INCLUDES= \ prime.h \ bitops.h \ conf.h getopt.h ipaccess.h \ - fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h \ + fastbuf.h io.h ff-unicode.h ff-varint.h ff-binary.h fb-socket.h \ url.h \ mainloop.h \ process.h \ lizard.h \ md5.h sha1.h crc.h \ base64.h base224.h \ - kmp.h kmp-search.h binsearch.h \ + kmp.h kmp-search.h trie.h binsearch.h \ partmap.h \ strtonum.h \ resource.h trans.h \ daemon.h \ signames.h \ + sighandler.h \ opt.h ifdef CONFIG_UCW_THREADS @@ -88,12 +90,24 @@ 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)) +export LIBUCW_LIBS=-lm +ifdef CONFIG_UCW_THREADS +LIBUCW_LIBS+=-lpthread +endif +ifdef CONFIG_UCW_PCRE +LIBUCW_LIBS+=-lpcre +endif +ifdef CONFIG_UCW_MONOTONIC_CLOCK +LIBUCW_LIBS+=-lrt +endif + +$(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(LIBUCW_MOD_PATHS)) +$(o)/ucw/libucw$(LV).so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS)) +$(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.0 +$(o)/ucw/libucw$(LV).so: LIBS+=$(LIBUCW_LIBS) -ifdef CONFIG_STATIC_PIC -$(o)/ucw/libucw.pc: $(o)/ucw/libucw-pic.a +ifdef CONFIG_INSTALL_API +$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a .so) endif $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops @@ -115,13 +129,15 @@ $(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) +$(o)/ucw/opt-test: $(o)/ucw/opt-test.o $(LIBUCW) -TESTS+=$(addprefix $(o)/ucw/,varint.test regex.test unicode.test hash-test.test mempool.test stkstring.test \ - slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test ff-varint.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 fb-multi.test url.test strtonum-test.test \ - gary.test time.test crc.test signames.test md5.test opt.test) +TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \ + slists.test bbuf.test kmp-test.test getopt.test ff-unicode.test eltpool.test \ + trie-test.test string.test sha1.test asort-test.test binheap-test.test \ + fb-file.test fb-socket.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 fb-multi.test fb-null.test \ + redblack-test.test url.test strtonum-test.test \ + gary.test time.test crc.test signames.test md5.test bitops.test opt.test) $(o)/ucw/varint.test: $(o)/ucw/varint-t $(o)/ucw/regex.test: $(o)/ucw/regex-t @@ -129,7 +145,7 @@ $(o)/ucw/unicode.test: $(o)/ucw/unicode-t $(o)/ucw/hash-test.test: $(o)/ucw/hash-test $(o)/ucw/mempool.test: $(o)/ucw/mempool-t $(o)/ucw/mempool-fmt-t $(o)/ucw/mempool-str-t $(o)/ucw/stkstring.test: $(o)/ucw/stkstring-t -$(o)/ucw/bitops.test: $(o)/ucw/bit-ffs-t $(o)/ucw/bit-fls-t $(o)/ucw/bit-count-t +$(o)/ucw/bitops.test: $(o)/ucw/bit-ffs-t $(o)/ucw/bit-fls-t $(o)/ucw/slists.test: $(o)/ucw/slists-t $(o)/ucw/kmp-test.test: $(o)/ucw/kmp-test $(o)/ucw/bbuf.test: $(o)/ucw/bbuf-t @@ -145,14 +161,14 @@ $(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 multi.test): %.test: %-t + limfd.test temp.test mem.test buffer.test mmap.test multi.test null.test): %.test: %-t $(o)/ucw/url.test: $(o)/ucw/url-t $(o)/ucw/gary.test: $(o)/ucw/gary-t $(o)/ucw/time.test: $(o)/ucw/time-conf-t $(o)/ucw/crc.test: $(o)/ucw/crc-t $(o)/ucw/signames.test: $(o)/ucw/signames-t $(o)/ucw/md5.test: $(o)/ucw/md5-t -$(o)/ucw/opt.test: $(o)/ucw/opt-t +$(o)/ucw/opt.test: $(o)/ucw/opt-test ifdef CONFIG_UCW_THREADS TESTS+=$(addprefix $(o)/ucw/,asio.test) @@ -183,15 +199,24 @@ 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_TARGETS+=install-libucw-lib +install-libucw-lib: + install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) + install -m 644 run/lib/libucw$(LV).so.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0.0 + ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so.0 +.PHONY: install-libucw-lib + +INSTALL_TARGETS+=install-libucw-api +install-libucw-api: install-ucw-sorter-api + install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_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) -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) + ln -sf libucw$(LV).so.0.0 $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so + install -m 644 run/lib/libucw$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR) +.PHONY: install-libucw-api -.PHONY: install-libucw +INSTALL_TARGETS+=install-libucw-config +install-libucw-config: + install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR) + install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR) +.PHONY: install-libucw-config