X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2FMakefile;h=5c328ca413a76513534b6579d2f0c58dc09ffec6;hb=ca1e06ed14e04fe2bcff4dca15cdea1e65a5ab65;hp=6a150ac69f6b3d4351964b1c5e06ad4f3f03e707;hpb=2d867cc5427fc9a703262fddbabd62d46b4badfa;p=libucw.git

diff --git a/ucw/Makefile b/ucw/Makefile
index 6a150ac6..5c328ca4 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -33,8 +33,8 @@ LIBUCW_MODS= \
 	bbuf \
 	getopt
 
-LIBUCW_LOCAL_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 \
@@ -62,14 +62,14 @@ LIBUCW_LOCAL_INCLUDES= \
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
 LIBUCW_MODS+=threads-conf workqueue asio fb-direct
-LIBUCW_LOCAL_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_LOCAL_INCLUDES)
+LIBUCW_INCLUDES=$(LIBUCW_MAIN_INCLUDES)
 
 include $(s)/ucw/sorter/Makefile
 include $(s)/ucw/doc/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,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
 
@@ -144,17 +149,12 @@ ifdef CONFIG_UCW_SHELL_UTILS
 include $(s)/ucw/shell/Makefile
 endif
 
-ifdef CONFIG_SHARED
-LIBUCW_NAME=libucw.so
-else
-LIBUCW_NAME=libucw.a
-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 -m 644 $(addprefix run/include/ucw/,$(LIBUCW_LOCAL_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
+	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_NAME) $(DESTDIR)$(INSTALL_LIB_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