DIRS+=ucw
LIBUCW=$(o)/ucw/libucw.pc
-PROGS+=$(o)/ucw/basecode
+ifdef CONFIG_UCW_UTILS
+include $(s)/ucw/utils/Makefile
+endif
LIBUCW_MODS= \
threads \
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 \
+ 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 \
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 \
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 \
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_MAIN_INCLUDES+=workqueue.h semaphore.h asio.h
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/kmp-test: $(o)/ucw/kmp-test.o $(LIBUCW) $(LIBCHARSET)
$(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 \
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)
+ 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
$(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): %.test: %-t
+ 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 <ucw/autoconf.h>
+# 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
+$(o)/ucw/.include-stamp: $(addprefix $(s)/ucw/,$(LIBUCW_INCLUDES)) $(o)/ucw/autoconf.h
$(Q)$(s)/build/install-includes $(<D) run/include/ucw $(LIBUCW_INCLUDES)
- $(Q)$(s)/build/install-includes obj run/include/ucw autoconf.h
+ $(Q)$(s)/build/install-includes $(o)/ucw run/include/ucw autoconf.h
+ $(Q)sed -e 's/^#include "autoconf\.h"/#include <ucw\/autoconf.h>/' <$(s)/ucw/config.h >run/include/ucw/config.h
$(Q)touch $@
run/lib/pkgconfig/libucw.pc: $(o)/ucw/libucw.pc
ifdef CONFIG_UCW_SHELL_UTILS
include $(s)/ucw/shell/Makefile
endif
+
+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)
+
+.PHONY: install-libucw