[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/8] refactor: rename a subroutine to a more proper name
From: |
Stefano Lattarini |
Subject: |
[PATCH 4/8] refactor: rename a subroutine to a more proper name |
Date: |
Sun, 9 Oct 2011 10:53:00 +0200 |
* 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 <address@hidden>
+ 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 <address@hidden>
+
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 ($$@)
--
1.7.2.3
- [PATCH 0/8] Reorganize automake internals for distribution tarball creation, Stefano Lattarini, 2011/10/09
- [PATCH 4/8] refactor: rename a subroutine to a more proper name,
Stefano Lattarini <=
- [PATCH 2/8] dist: simplify automake code accordingly to the previous changes, Stefano Lattarini, 2011/10/09
- [PATCH 3/8] dist: truly always distribute files in AC_REQUIRE_AUX_FILE, Stefano Lattarini, 2011/10/09
- [PATCH 1/8] dist: auxiliary files can be distributed from subdir Makefiles, Stefano Lattarini, 2011/10/09
- [PATCH 5/8] dist: separate auxiliary file instantiation from DIST_COMMON update, Stefano Lattarini, 2011/10/09
- [PATCH 8/8] tests: fix spurious failure with Solaris /bin/sh, Stefano Lattarini, 2011/10/09
- [PATCH 7/8] threaded-am: better serialization for required config files, Stefano Lattarini, 2011/10/09
- [PATCH 6/8] automake: refactor, break up 'require_file_internal', Stefano Lattarini, 2011/10/09
- Re: [PATCH 0/8] Reorganize automake internals for distribution tarball creation, Stefano Lattarini, 2011/10/12
- [FYI 9/8] {dist-refactor} cosmetics: remove obsolete comment, Stefano Lattarini, 2011/10/17