no-dist-built-sources: fix-up

* bin/automake.in (preprocess_file): Process new option here,
(handle_dist): ... not here.
* lib/Automake/Options.pm (_is_valid_easy_option):
Remove pure-dist.
* lib/am/distdir.am: Don't factor out the duplicate-looking
$(MAKE)... command.  Otherwise, many dist-using tests would fail
for me, e.g., t/aclocal-amflags.sh.

diff --git a/bin/automake.in b/bin/automake.in
index fde572cd113610033551ced60d58441ebf04866e..f6ebe30ea8b4539b70a401bbd61c034b8577aec4 100644 (file)
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -3920,9 +3920,7 @@ sub handle_dist ()
   $output_rules .= file_contents ('distdir',
                                  new Automake::Location,
                                  %transform,
-                                 FILENAME_FILTER => $filename_filter,
-                                 DIST_BUILT_SOURCES
-                                   => ! option 'no-dist-built-sources');
+                                 FILENAME_FILTER => $filename_filter);
 }
 
 
@@ -6865,6 +6863,7 @@ sub preprocess_file
                 'SHAR'        => !! option 'dist-shar',
                 'ZIP'         => !! option 'dist-zip',
                 'ZSTD'        => !! option 'dist-zstd',
+                'DIST_BUILT_SOURCES' => !! option 'dist-built-sources',
 
                 'INSTALL-INFO' =>  ! option 'no-installinfo',
                 'INSTALL-MAN'  =>  ! option 'no-installman',

diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 6c07e5048a734247ce8134ba0633c2324b113696..622b9ce659f84ac39fe9b5539c4c5b0632ab303c 100644 (file)
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -290,7 +290,6 @@ sub _is_valid_easy_option ($)
     no-installman
     no-texinfo.tex
     nostdinc
-    pure-dist
     readme-alpha
     serial-tests
     parallel-tests

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 3b60b6e0bbd2dc85396ab3749a5e8c04ed218313..9bd30280465210fd52b5953dd338e1382cc314b2 100644 (file)
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -77,10 +77,11 @@ endif %?SUBDIRS%
 
 if %?DIST_BUILT_SOURCES%
 distdir:
+       $(MAKE) $(AM_MAKEFLAGS) distdir-am
 else !%?DIST_BUILT_SOURCES%
 distdir: $(BUILT_SOURCES)
-endif !%?DIST_BUILT_SOURCES%
        $(MAKE) $(AM_MAKEFLAGS) distdir-am
+endif !%?DIST_BUILT_SOURCES%
 
 distdir-am: $(DISTFILES)
 ##