OMIT_DEPENDENCIES patch

diff --git a/ChangeLog b/ChangeLog
index 8ca515ae360289c0631c02ae4737f7d148cf92fe..ff8ce90dd6ff262b81c83d5b29b1418833885948 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Mon Aug 25 15:45:52 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * 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 8e2f35162614cc2a30a235a4e3962eee76dce6cf..d2108df98e1c1cfd720a612346c6651a440876c8 100755 (executable)
--- 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);
            }
        }
     }