From ba7d341ccf72d0e29554802fc399a24ea3aaaa3a Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 30 Oct 2008 23:07:15 +0100 Subject: [PATCH] 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. --- ucw/Makefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ucw/Makefile b/ucw/Makefile index a26c9036..b24e0fe5 100644 --- 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 +# 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 $(/' <$(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 -# instead of plain "autoconf.h". -$(o)/ucw/config.h: $(s)/ucw/config.h - $(M)"FILTER $< -> $@" - $(Q)sed -e 's/^#include "autoconf\.h"/#include /' <$< >$@ - ifdef CONFIG_UCW_PERL include $(s)/ucw/perl/Makefile endif -- 2.39.2