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

diff --git a/ucw/Makefile b/ucw/Makefile
index a26c9036..5c328ca4 100644
--- 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