From 2cf1436555709b50d9ccaefc88758b30337dcc67 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 25 Aug 1997 21:51:14 +0000 Subject: [PATCH] OMIT_DEPENDENCIES patch --- ChangeLog | 3 +++ automake.in | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ca515ae..ff8ce90d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Mon Aug 25 15:45:52 1997 Tom Tromey + * automake.in (scan_dependency_file): Fix so that + OMIT_DEPENDENCIES will work. From Alexander Lukyanov. + * automake.in (handle_texinfo): texi2dvi can generate `.cn' files. From Akim Demaille. diff --git a/automake.in b/automake.in index 8e2f3516..d2108df9 100755 --- a/automake.in +++ b/automake.in @@ -2624,6 +2624,9 @@ sub scan_dependency_file foreach $one_dep (split (' ', $_)) { + ($just_file = $one_dep) =~ s,^.*/,,; + next if defined $omit{$just_file}; + if ($one_dep =~ /^$fixup_rx/) { # The dependency points to the current directory in @@ -2643,12 +2646,8 @@ sub scan_dependency_file } else { - # Anything else is assumed to be correct. But first - # make sure it is not on our list of dependencies to - # omit. - ($just_file = $one_dep) =~ s,^.*/,,; - push (@dependencies, $one_dep) - if ! defined $omit{$just_file}; + # Anything else is assumed to be correct. + push (@dependencies, $one_dep); } } } -- 2.43.5