Doc system: Allow building in default target

[libucw.git] / ucw / Makefile

diff --git a/ucw/Makefile b/ucw/Makefile
index 0f2dc39eace705474d9c2a7babe9c22e72ec4ff3..5c328ca413a76513534b6579d2f0c58dc09ffec6 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -4,9 +4,7 @@ DIRS+=ucw
 LIBUCW=$(o)/ucw/libucw.pc
 
 ifdef CONFIG_UCW_UTILS
-UCW_UTILS=basecode b224 rotate-log urltool daemon-helper hex
-
-PROGS+=$(addprefix $(o)/ucw/,$(UCW_UTILS))
+include $(s)/ucw/utils/Makefile
 endif
 
 LIBUCW_MODS= \
@@ -35,8 +33,8 @@ 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 \
@@ -47,7 +45,7 @@ LIBUCW_INCLUDES= \
        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 \
@@ -64,13 +62,15 @@ 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_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
 
@@ -93,7 +93,6 @@ $(o)/ucw/lizard-test: $(o)/ucw/lizard-test.o $(LIBUCW)
 $(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 \
@@ -121,7 +120,6 @@ $(o)/ucw/binheap-test.test: $(o)/ucw/binheap-test
 $(o)/ucw/redblack-test.test: $(o)/ucw/redblack-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
@@ -129,11 +127,17 @@ 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
 
@@ -145,12 +149,12 @@ ifdef CONFIG_UCW_SHELL_UTILS
 include $(s)/ucw/shell/Makefile
 endif
 
-ifdef CONFIG_UCW_UTILS
-$(o)/ucw/b224: $(o)/ucw/b224.o $(LIBUCW)
-$(o)/ucw/daemon-helper: $(o)/ucw/daemon-helper.o $(LIBUCW)
-$(o)/ucw/urltool: $(o)/ucw/urltool.o $(LIBUCW)
-$(o)/ucw/hex: $(o)/ucw/hex.o $(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/cf/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
-TESTS+=$(o)/ucw/basecode.test
-$(o)/ucw/basecode.test: $(o)/ucw/basecode
-endif
+.PHONY: install-libucw