* automake.in (handle_single_transform_list): Don't print rule

	here when source is in subdir and object is not.  Fixes
	subobj4.test.

diff --git a/ChangeLog b/ChangeLog
index 7277cabc91c96d6860d0ad605a1af4287a8f0949..489af45e53fac919361709ec30d213b4bc724937 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-15  Tom Tromey  <tromey@redhat.com>
 
+       * automake.in (handle_single_transform_list): Don't print rule
+       here when source is in subdir and object is not.  Fixes
+       subobj4.test.
+
        * automake.in (handle_single_transform_list): Correctly compute
        $nonansi_obj.  Fixes cxxansi.test.
 

diff --git a/automake.in b/automake.in
index 49ce9004b2a942e6e7c4fc828fbcf0ced26191d6..dd35c41dfa086f08661bc2a01a92c8d47c13f8bc 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1279,12 +1279,15 @@ sub handle_single_transform_list
                }
 
                # If doing dependency tracking, then we can't print
-               # the rule.  Also, if we have a subdir object, we need
-               # to generate an explicit rule.
+               # the rule.  If we have a subdir object, we need to
+               # generate an explicit rule.  Actually, in any case
+               # where the object is not in `.' we need a special
+               # rule.  The per-object rules in this case are
+               # generated later, by add_depend2.
                if (($use_dependencies
                     && $rule ne ''
                     && $language_map{$lang . '-autodep'} ne 'no')
-                   || ($r == $LANG_SUBDIR && $directory ne ''))
+                   || $directory ne '')
                {
                    $rule = '';
                    local ($obj_sans_ext) = substr ($object, 0,