[PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 36.

[Collin Funk]

Follow gnulib-tool change
2017-03-14  Mathieu Lirzin  <mthl@gnu.org>
gnulib-tool: don't automatically distribute files from top/

* pygnulib/GLModuleSystem.py
(GLModule.getAutomakeSnippet_Unconditional): Don't distribute files from
top/ automatically.
---
A good way to test this:

$ gnulib-tool --create-testdir test-shell readme-release
gnulib-tool.py --create-testdir --dir test-python readme-release
git diff --no-index test-python/gllib/Makefile.am test-shell/gllib/Makefile.am

Collin

 ChangeLog                  | 10 ++++++++++
 gnulib-tool.py.TODO        | 14 --------------
 pygnulib/GLModuleSystem.py |  9 ---------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4c78b8666..9536c174f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-02-29  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool.py: Follow gnulib-tool changes, part 36.
+       Follow gnulib-tool change
+       2017-03-14  Mathieu Lirzin  <mthl@gnu.org>
+       gnulib-tool: don't automatically distribute files from top/
+       * pygnulib/GLModuleSystem.py
+       (GLModule.getAutomakeSnippet_Unconditional): Don't distribute files from
+       top/ automatically.
+
 2024-02-29  Bruno Haible  <bruno@clisp.org>
 
        xalloc: Don't use identifier 'nonnull'.
diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO
index d942119be0..3fe32282a7 100644
--- a/gnulib-tool.py.TODO
+++ b/gnulib-tool.py.TODO
@@ -793,20 +793,6 @@ Date:   Sat May 20 13:24:37 2017 +0200
 
 
--------------------------------------------------------------------------------
 
-commit f30205c5d59bab2c035165158e7d5d65b07b8363
-Author: Mathieu Lirzin <mthl@gnu.org>
-Date:   Tue Mar 14 12:19:40 2017 +0100
-
-    gnulib-tool: don't automatically distribute files from top/
-
-    * gnulib-tool (func_get_automake_snippet_unconditional): To be able to
-    not distribute top/README-release by default, don't distribute files
-    from top/ unconditionally.
-    * modules/gnumakefile (Makefile.am): Distribute top/GNUmakefile.
-    * modules/maintainer-makefile (Makefile.am): Distribute top/maint.mk.
-
---------------------------------------------------------------------------------
-
 commit 9bdf6c8a0cdeb13c12e4b65dee9538c5468dbe1d
 Author: Bruno Haible <bruno@clisp.org>
 Date:   Sun Aug 19 14:06:50 2012 +0200
diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py
index 675d33de32..3672474fa1 100644
--- a/pygnulib/GLModuleSystem.py
+++ b/pygnulib/GLModuleSystem.py
@@ -616,15 +616,6 @@ class GLModule(object):
                     buildaux_files = joinpath('$(top_srcdir)', auxdir, 
buildaux_files)
                     result += 'EXTRA_DIST += %s' % buildaux_files
                     result += '\n\n'
-                # Synthesize an EXTRA_DIST augmentation also for the files 
from top/.
-                top_files = filter_filelist(constants.NL, all_files,
-                                            'top/', '', 'top/', 
'').split(constants.NL)
-                top_files = sorted(set(top_files))
-                if top_files != ['']:
-                    top_files = ''.join(top_files)
-                    top_files = joinpath('$(top_srcdir)', top_files)
-                    result += 'EXTRA_DIST += %s' % top_files
-                    result += '\n\n'
             result = constants.nlconvert(result)
             self.cache['makefile-unconditional'] = result
         return self.cache['makefile-unconditional']
-- 
2.39.2