X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=d4a055ce1982cf0310088871a8c7aac49e90b237;hb=dd4af9ab4aa5e39ff3db44466b07b0c119b8aa21;hp=5d2ce0c2d748f2cf9279037a7740ec3a44d973df;hpb=91972e1a8200da60d621b5341fc2e672a6d9f77b;p=libucw.git diff --git a/ucw/Makefile b/ucw/Makefile index 5d2ce0c2..d4a055ce 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -1,136 +1,168 @@ -# 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 -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 \ + partmap hashfunc \ slists simple-lists bitsig \ - log log-file proctitle \ - conf-alloc conf-dump conf-input conf-intr conf-journal conf-parse conf-section \ + 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 \ - profile \ 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 \ + 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 \ char-cat char-upper char-lower unicode stkstring \ wildmatch regex \ - prime primetable random timer randomkey \ - bit-ffs bit-fls \ + prime primetable random \ + time-stamp time-timer time-conf \ + bit-ffs bit-fls bit-count \ url \ - mainloop exitstatus runcmd sighandler \ - lizard lizard-safe adler32 \ - md5 sha1 sha1-hmac \ + mainloop main-block main-rec \ + proctitle exitstatus runcmd \ + lizard lizard-safe adler32 sighandler \ + md5 sha1 sha1-hmac crc crc-tables \ base64 base224 \ - sync \ - qache \ - string str-esc str-split str-match str-imatch str-hex \ - bbuf \ - getopt - -LIBUCW_INCLUDES= \ - lib.h config.h threads.h \ - mempool.h \ - arraysort.h \ + io-careful io-sync io-mmap io-size \ + string str-esc str-split str-match str-imatch str-hex str-fix \ + bbuf gary \ + getopt \ + strtonum \ + resource trans res-fd res-mem res-subpool res-mempool res-eltpool \ + daemon daemon-ctrl \ + signames + +LIBUCW_MAIN_INCLUDES= \ + lib.h log.h threads.h time.h \ + mempool.h eltpool.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 \ + unaligned.h \ + bbuf.h gbuf.h gary.h bitarray.h bitsig.h \ hashfunc.h hashtable.h \ heap.h binheap.h binheap-node.h \ redblack.h \ - binsearch.h prime.h \ + prime.h \ bitops.h \ conf.h getopt.h ipaccess.h \ - profile.h \ - fastbuf.h lfs.h ff-unicode.h ff-binary.h \ + fastbuf.h io.h ff-unicode.h ff-binary.h \ url.h \ mainloop.h \ + process.h \ lizard.h \ - md5.h \ + md5.h sha1.h crc.h \ base64.h base224.h \ - qache.h \ kmp.h kmp-search.h binsearch.h \ - partmap.h + partmap.h \ + strtonum.h \ + resource.h trans.h \ + daemon.h \ + signames.h 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 +ifdef CONFIG_UCW_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)) +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 $(o)/ucw/conf-test: $(o)/ucw/conf-test.o $(LIBUCW) -$(o)/ucw/lfs-test: $(o)/ucw/lfs-test.o $(LIBUCW) $(o)/ucw/hash-test: $(o)/ucw/hash-test.o $(LIBUCW) $(o)/ucw/hashfunc-test: $(o)/ucw/hashfunc-test.o $(LIBUCW) $(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) -$(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 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 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) + 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) $(o)/ucw/regex.test: $(o)/ucw/regex-t $(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/bitops.test: $(o)/ucw/bit-ffs-t $(o)/ucw/bit-fls-t $(o)/ucw/bit-count-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 $(o)/ucw/getopt.test: $(o)/ucw/getopt-t $(o)/ucw/ff-unicode.test: $(o)/ucw/ff-unicode-t $(o)/ucw/eltpool.test: $(o)/ucw/eltpool-t -$(o)/ucw/string.test: $(o)/ucw/str-hex-t $(o)/ucw/str-esc-t +$(o)/ucw/string.test: $(o)/ucw/str-hex-t $(o)/ucw/str-esc-t $(o)/ucw/str-fix-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 +$(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/fb-atomic-tt.o: CFLAGS += -DFB_ATOMIC_TRACE + limfd.test temp.test mem.test buffer.test mmap.test multi.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 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 @@ -141,3 +173,18 @@ 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) +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