LibUCW: Reverted the config.h hack.

Unfortunately, the public version of config.h prepared in obj/ucw/
gets included by private source files as well, which leads to inclusion
of the public autoconf.h and so to invisibility of private symbols.

diff --git a/ucw/Makefile b/ucw/Makefile
index a26c9036b6fce0fdd66f7554432a43ad724e7543..b24e0fe57b2b9fbee04f8a286529ffe089fd5fe1 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -128,22 +128,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