Doc system: Allow building in default target

[libucw.git] / ucw / Makefile

diff --git a/ucw/Makefile b/ucw/Makefile
index e536663f00b42b8be4f61da7004a11e988385e7e..5c328ca413a76513534b6579d2f0c58dc09ffec6 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -120,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
@@ -128,22 +127,20 @@ 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)) $(o)/ucw/autoconf.h $(o)/ucw/config.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 $(o)/ucw run/include/ucw autoconf.h config.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
 
-# 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".
-$(o)/ucw/config.h: $(s)/ucw/config.h
-       $(M)"FILTER $< -> $@"
-       $(Q)sed -e 's/^#include "autoconf\.h"/#include <ucw\/autoconf.h>/' <$< >$@
-
 ifdef CONFIG_UCW_PERL
 include $(s)/ucw/perl/Makefile
 endif
@@ -154,9 +151,10 @@ endif
 
 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/cf/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 .PHONY: install-libucw