From 55fcf433636ddbbc77da7c7607a72ba82240ed76 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Wed, 6 Mar 2024 02:44:39 -0800 Subject: [PATCH] gnulib-tool.py: Fix value of LDADD for libtests. * pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Fix value of LDADD to match gnulib-tool. --- ChangeLog | 6 ++++++ pygnulib/GLEmiter.py | 16 +++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f6d58c2dd..0af21d2fe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-06 Collin Funk + + gnulib-tool.py: Fix value of LDADD for libtests. + * pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Fix value of LDADD + to match gnulib-tool. + 2024-03-06 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 44. diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 43c19a4026..6b90c4956f 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -1156,8 +1156,6 @@ AC_DEFUN([%V1%_LIBSOURCES], [ emit += ' -I%s/%s -I$(srcdir)/%s/%s\n' % (testsbase_inverse, sourcebase, testsbase_inverse, sourcebase) emit += '\n' - ldadd_before = '' - ldadd_after = '' if libtests: # All test programs need to be linked with libtests.a. # It needs to be passed to the linker before ${libname}.${libext}, @@ -1168,13 +1166,13 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # voluntarily omitted). # The LIBTESTS_LIBDEPS can be passed to the linker once or twice, it # does not matter. - ldadd_before = ' libtests.a' - ldadd_after = ' libtests.a $(LIBTESTS_LIBDEPS)' - emit += 'LDADD =%s %s/%s/%s.%s libtests.a %s/%s/%s.%s%s\n\n' \ - % (ldadd_before, - testsbase_inverse, sourcebase, libname, libext, - testsbase_inverse, sourcebase, libname, libext, - ldadd_after) + emit += ("LDADD = libtests.a %s/%s/%s.%s libtests.a %s/%s/%s.%s libtests.a $(LIBTESTS_LIBDEPS)\n" + % (testsbase_inverse, sourcebase, libname, libext, + testsbase_inverse, sourcebase, libname, libext)) + else: + emit += ("LDADD = %s/%s/%s.%s\n" + % (testsbase_inverse, sourcebase, libname, libext)) + emit += '\n' if libtests: emit += 'libtests_a_SOURCES =\n' # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, -- 2.39.5