X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2FMakefile;h=4bb7f8e3052343350be7cdfc73327d54c1011963;hb=2c7483b13f06f97b8a3d98f27ebe5ebf003be1c2;hp=e536663f00b42b8be4f61da7004a11e988385e7e;hpb=49cc1af2b8ca45da36f7de49585f02fd653e3b97;p=libucw.git diff --git a/ucw/Makefile b/ucw/Makefile index e536663f..4bb7f8e3 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--2009 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 \ @@ -31,12 +31,12 @@ LIBUCW_MODS= \ qache \ string str-esc str-split str-match str-imatch str-hex \ bbuf \ - getopt + 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 \ @@ -57,14 +57,19 @@ LIBUCW_MAIN_INCLUDES= \ base64.h base224.h \ qache.h \ kmp.h kmp-search.h binsearch.h \ - partmap.h + partmap.h \ + strnonum.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,6 +82,7 @@ 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 @@ -90,15 +96,19 @@ $(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) $(o)/ucw/regex.test: $(o)/ucw/regex-t $(o)/ucw/unicode.test: $(o)/ucw/unicode-t @@ -118,9 +128,9 @@ $(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/fb-atomic-tt.o: CFLAGS += -DFB_ATOMIC_TRACE $(o)/ucw/url.test: $(o)/ucw/url-t ifdef CONFIG_UCW_THREADS @@ -128,21 +138,19 @@ TESTS+=$(addprefix $(o)/ucw/,asio.test) $(o)/ucw/asio.test: $(o)/ucw/asio-t endif -API_LIBS+=libucw -API_INCLUDES+=$(o)/ucw/.include-stamp -$(o)/ucw/.include-stamp: $(addprefix $(s)/ucw/,$(LIBUCW_INCLUDES)) $(o)/ucw/autoconf.h $(o)/ucw/config.h - $(Q)$(s)/build/install-includes $( # instead of plain "autoconf.h". -$(o)/ucw/config.h: $(s)/ucw/config.h - $(M)"FILTER $< -> $@" - $(Q)sed -e 's/^#include "autoconf\.h"/#include /' <$< >$@ + +API_LIBS+=libucw +API_INCLUDES+=$(o)/ucw/.include-stamp +$(o)/ucw/.include-stamp: $(addprefix $(s)/ucw/,$(LIBUCW_INCLUDES)) $(o)/ucw/autoconf.h + $(Q)$(BUILDSYS)/install-includes $(/' <$(s)/ucw/config.h >run/include/ucw/config.h + $(Q)touch $@ +run/lib/pkgconfig/libucw.pc: $(o)/ucw/libucw.pc ifdef CONFIG_UCW_PERL include $(s)/ucw/perl/Makefile @@ -152,11 +160,14 @@ 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) + 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