diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-10 18:04:33 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-15 15:53:29 +0200 |
| commit | 1fa0c24dbbfcdec1eccd8bd3242ae9ef20ff1ddb (patch) | |
| tree | 1d2fc9a9bf68aeab795133a9bda023c06a9d5fa5 /bin | |
| parent | 9fabb5e4520f583f18cdb80b4b7b55c7f5ba856c (diff) | |
| download | automake-1fa0c24dbbfcdec1eccd8bd3242ae9ef20ff1ddb.tar.gz | |
depend: refactor and remove code duplication
* lib/am/depend2.am: Here. The obsolescent comments removed from this
same file in commit 'v1.13.1-42-g8f06bfb' of 2012-01-09, "depend2.am: fix
comments on verbosity of compilation rules", gave the rationale for why
that code duplication was there in the first place (rationale that, like
those comments, has been obsolete by the silent-rules introduction).
* bin/automake.in: Given the refactoring in 'depend2.am', there is no
longer need to add extra trailing whitespace to the entries of the
'%sourceflags' hash (which are used for the '%SOURCEFLAG%' transform
when 'depend2.am' is processed.
* t/fort2.sh: Adjust to avoid spurious failures.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/automake.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/automake.in b/bin/automake.in index c87acba72..04906b3f3 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -5060,9 +5060,7 @@ sub scan_autoconf_traces elsif ($macro eq 'AC_FC_SRCEXT') { my $suffix = $args[1]; - # These flags are used as %SOURCEFLAG% in depend2.am, - # where the trailing space is important. - $sourceflags{'.' . $suffix} = '$(FCFLAGS_' . $suffix . ') ' + $sourceflags{'.' . $suffix} = '$(FCFLAGS_' . $suffix . ')' if ($suffix eq 'f90' || $suffix eq 'f95' || $suffix eq 'f03' || $suffix eq 'f08'); } elsif ($macro eq 'AC_INIT') |