From 6571c2fd4e7eca643f7d994efad52a4120118ccc Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 7 Oct 2011 15:49:17 +0200 Subject: [PATCH] refactor: rename a subroutine to a more proper name * automake.in (maybe_push_require_file): Renamed ... (push_required_file): ... to this. All callers adjusted. --- ChangeLog | 7 +++++++ automake.in | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5244237..aff4d06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-10-08 Stefano Lattarini + refactor: rename a subroutine to a more proper name + * automake.in (maybe_push_require_file): Renamed ... + (push_required_file): ... to this. + All callers adjusted. + +2011-10-08 Stefano Lattarini + dist: truly always distribute files in AC_REQUIRE_AUX_FILE This change fixes automake bug#9651. * automake.in (handle_dist): Files whose distribution is required diff --git a/automake.in b/automake.in index 9159fc6..951d5c7 100644 --- a/automake.in +++ b/automake.in @@ -5551,7 +5551,7 @@ sub scan_autoconf_files () # Look for some files we need. Always check for these. This # check must be done for every run, even those where we are only # looking at a subdir Makefile. We must set relative_dir for - # maybe_push_required_file to work. + # push_required_file to work. # Sort the files for stable verbose output. $relative_dir = '.'; foreach my $file (sort keys %required_aux_file) @@ -7578,10 +7578,10 @@ sub locate_aux_dir () } -# &maybe_push_required_file ($DIR, $FILE, $FULLFILE) +# &push_required_file ($DIR, $FILE, $FULLFILE) # -------------------------------------------------- # Push the given file onto DIST_COMMON. -sub maybe_push_required_file +sub push_required_file { my ($dir, $file, $fullfile) = @_; @@ -7687,7 +7687,7 @@ sub require_file_internal ($$$@) elsif (dir_has_case_matching_file ($dir, $file)) { $found_it = 1; - maybe_push_required_file ($dir, $file, $fullfile); + push_required_file ($dir, $file, $fullfile); } # `--force-missing' only has an effect if `--add-missing' is @@ -7763,7 +7763,7 @@ sub require_file_internal ($$$@) } set_dir_cache_file ($dir, $file); } - maybe_push_required_file ($dir, $file, $fullfile); + push_required_file ($dir, $file, $fullfile); } else { @@ -7883,7 +7883,7 @@ sub require_queued_conf_file ($) # worker threads may queue up the action to be serialized by the master. # # FIXME: this seriously relies on the semantics of require_file_internal -# and maybe_push_required_file, in that we exploit the fact that only the +# and push_required_file, in that we exploit the fact that only the # contents of the last handled output file may be impacted (which in turn # is dealt with by the master thread). sub require_conf_file ($$@) -- 2.7.4