From: Tom Tromey <tromey@redhat.com>
Date: Tue, 16 Jan 2001 06:34:03 +0000 (+0000)
Subject: 	* automake.in (handle_single_transform_list): Don't print rule
X-Git-Tag: Release-1-4d~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17428a197bb794db1e35f25deb08ecd682b4800f;p=thirdparty%2Fautomake.git

	* 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 7277cabc9..489af45e5 100644
--- 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 49ce9004b..dd35c41df 100755
--- 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,