X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2FMakefile;h=ccfc20ce972dc505b94e99f1d0376ae672a63e92;hb=003ca21e49148941c07f69c87e2553f660913b65;hp=68094263eb9e31976054ce8761d8fe6fe9adae08;hpb=bf2c518567234e83a731fa0263ae58c4b6fee4c3;p=libucw.git diff --git a/ucw/Makefile b/ucw/Makefile index 68094263..ccfc20ce 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -1,21 +1,23 @@ -# Makefile for the UCW Library (c) 1997--2008 Martin Mares +# Makefile for the UCW Library (c) 1997--2009 Martin Mares DIRS+=ucw LIBUCW=$(o)/ucw/libucw.pc -PROGS+=$(o)/ucw/basecode +ifdef CONFIG_UCW_UTILS +include $(s)/ucw/utils/Makefile +endif LIBUCW_MODS= \ threads \ 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 \ conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \ ipaccess \ profile \ - 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 \ + fastbuf ff-binary ff-string ff-printf ff-unicode ff-stkstring \ + fb-file carefulio fb-mem fb-temp tempfile fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket \ char-cat char-upper char-lower unicode stkstring \ wildmatch regex \ prime primetable random timer randomkey \ @@ -31,10 +33,9 @@ LIBUCW_MODS= \ bbuf \ getopt -LIBUCW_INCLUDES= \ - lib.h config.h threads.h \ +LIBUCW_MAIN_INCLUDES= \ + lib.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 \ @@ -43,7 +44,7 @@ LIBUCW_INCLUDES= \ hashfunc.h hashtable.h \ heap.h binheap.h binheap-node.h \ redblack.h \ - binsearch.h \ + prime.h \ bitops.h \ conf.h getopt.h ipaccess.h \ profile.h \ @@ -59,19 +60,27 @@ LIBUCW_INCLUDES= \ ifdef CONFIG_UCW_THREADS # Some modules require threading -LIBUCW_MODS+=threads-conf workqueue asio fb-direct -LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h +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 +LIBUCW_INCLUDES=$(LIBUCW_MAIN_INCLUDES) + include $(s)/ucw/sorter/Makefile +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)) $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops @@ -85,15 +94,18 @@ $(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) +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) -$(o)/ucw/basecode: $(o)/ucw/basecode.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 fastbuf.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 basecode.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) $(o)/ucw/regex.test: $(o)/ucw/regex-t $(o)/ucw/unicode.test: $(o)/ucw/unicode-t @@ -105,28 +117,34 @@ $(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 $(o)/ucw/getopt.test: $(o)/ucw/getopt-t -$(o)/ucw/fastbuf.test: $(o)/ucw/fb-file-t $(o)/ucw/fb-grow-t $(o)/ucw/fb-pool-t $(o)/ucw/ff-unicode.test: $(o)/ucw/ff-unicode-t $(o)/ucw/eltpool.test: $(o)/ucw/eltpool-t -$(o)/ucw/fb-socket.test: $(o)/ucw/fb-socket-t $(o)/ucw/string.test: $(o)/ucw/str-hex-t $(o)/ucw/str-esc-t $(o)/ucw/sha1.test: $(o)/ucw/sha1-t $(o)/ucw/sha1-hmac-t $(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/basecode.test: $(o)/ucw/basecode +$(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 ifdef CONFIG_UCW_THREADS TESTS+=$(addprefix $(o)/ucw/,asio.test) $(o)/ucw/asio.test: $(o)/ucw/asio-t endif +# The version of autoconf.h that is a part of the public API needs to have +# the internal symbols filtered out, so we generate ucw/autoconf.h in the +# configure script and let the public config.h refer to +# instead of plain "autoconf.h". + API_LIBS+=libucw API_INCLUDES+=$(o)/ucw/.include-stamp -$(o)/ucw/.include-stamp: $(addprefix $(s)/ucw/,$(LIBUCW_INCLUDES)) obj/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 @@ -137,3 +155,15 @@ endif 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/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR) + +.PHONY: install-libucw