]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.py: Fix last commit.
authorBruno Haible <bruno@clisp.org>
Sun, 3 Mar 2024 10:12:39 +0000 (11:12 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 3 Mar 2024 10:12:39 +0000 (11:12 +0100)
* pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Ignore libname and
libext here.

ChangeLog
pygnulib/GLEmiter.py

index 68d944dd1428f0598938fe55b7d46b4f198d2ab6..c5bfab2ef718495e6e7f67221a09e9709c19323f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-03  Bruno Haible  <bruno@clisp.org>
+
+       gnulib-tool.py: Fix last commit.
+       * pygnulib/GLEmiter.py (GLEmiter.tests_Makefile_am): Ignore libname and
+       libext here.
+
 2024-03-03  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool.py: Follow gnulib-tool changes, part 38.
index 7115dfe1156a8a0ca648e54018d6eb3f91f35e90..2a8ede93354a6b64a69b7c1e036bb98daea5b0c5 100644 (file)
@@ -887,8 +887,8 @@ AC_DEFUN([%V1%_LIBSOURCES], [
 
     def tests_Makefile_am(self, destfile, modules, moduletable,
                           makefiletable, witness_macro, for_test):
-        '''GLEmiter.tests_Makefile_am(destfile, modules, makefiletable,
-             witness_c_macro, for_test) -> tuple of string and bool
+        '''GLEmiter.tests_Makefile_am(destfile, modules, moduletable,
+             makefiletable, witness_c_macro, for_test) -> tuple of string and bool
 
         Emit the contents of the tests Makefile. Returns str and a bool variable
         which shows if subdirectories are used.
@@ -995,14 +995,13 @@ AC_DEFUN([%V1%_LIBSOURCES], [
                     amsnippet1 += 'libtests_a_LIBADD += @ALLOCA@\n'
                     amsnippet1 += 'libtests_a_DEPENDENCIES += @ALLOCA@\n'
 
-                amsnippet1 = constants.combine_lines_matching(re.compile('%s_%s_SOURCES' % (libname, libext)),
+                amsnippet1 = constants.combine_lines_matching(re.compile('libtests_a_SOURCES'),
                                                               amsnippet1)
 
                 # Get unconditional snippet, edit it and save to amsnippet2.
                 amsnippet2 = module.getAutomakeSnippet_Unconditional()
                 pattern = re.compile('lib_([A-Z][A-Z]*)', re.M)
-                amsnippet2 = pattern.sub('%s_%s_\\1' % (libname, libext),
-                                         amsnippet2)
+                amsnippet2 = pattern.sub('libtests_a_\\1', amsnippet2)
                 amsnippet2 = amsnippet2.replace('$(GNULIB_',
                                                 '$(' + module_indicator_prefix + '_GNULIB_')
                 # Skip the contents if it's entirely empty.