From: Bruno Haible <bruno@clisp.org>
Date: Tue, 4 Feb 2025 00:03:53 +0000 (+0100)
Subject: libtextstyle: Improve namespacing.
X-Git-Tag: v0.24~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3022e633c58b3032c9a23d8be97e0e5a026eed2b;p=thirdparty%2Fgettext.git

libtextstyle: Improve namespacing.

* gettext-tools/libgettextpo/Makefile.am (COMPILATION_UNITS): Fix reference to
LIBOBJS variable.
(config.h): Remove leading part of the elements of
$(lts_libtextstyle_LTLIBOBJS).
---

diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am
index f5ad18907..16eb50ba5 100644
--- a/libtextstyle/lib/Makefile.am
+++ b/libtextstyle/lib/Makefile.am
@@ -194,10 +194,10 @@ libtextstyle.sym : $(srcdir)/libtextstyle.sym.in
 MOSTLYCLEANFILES += libtextstyle.sym libtextstyle.sym-t
 
 # Hide undesired symbols that are defined by libtextstyle_la_SOURCES or
-# gl_LIBOBJS or the dependency libraries from the global namespace,
-# by prefixing them with "libtextstyle_".
+# lts_libtextstyle_LTLIBOBJS or the dependency libraries from the global
+# namespace, by prefixing them with "libtextstyle_".
 all check install: config.h
-COMPILATION_UNITS = $(libtextstyle_la_SOURCES) $(gl_LIBOBJS)
+COMPILATION_UNITS = $(libtextstyle_la_SOURCES) $(lts_libtextstyle_LTLIBOBJS)
 if INCLUDED_LIBCROCO
 COMPILATION_UNITS += $(libcroco_rpl_la_SOURCES)
 endif
@@ -224,7 +224,7 @@ config.h: $(BUILT_SOURCES) libtextstyle.sym
 	        case $$f in \
 	          *.res.lo ) ;; \
 	          *.c | *.$(OBJEXT) | *.lo ) \
-	            sf=`echo "$$f" | sed -e 's,\\.[^.]*$$,,'`.c; \
+	            sf=`echo "$$f" | sed -e 's,^libtextstyle_la-,,' -e 's,\\.[^.]*$$,,'`.c; \
 	            test -f $$sf || sf=$(srcdir)/$$sf; \
 	            of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \
 	            echo "$(COMPILE) $(GL_CFLAG_INHIBIT_WARNINGS) -c $$sf" 1>&6; \