From f54598d15722ad1091bab49fddc60c16eac87411 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 16 Jan 2001 06:34:03 +0000 Subject: [PATCH] * automake.in (handle_single_transform_list): Don't print rule here when source is in subdir and object is not. Fixes subobj4.test. --- ChangeLog | 4 ++++ automake.in | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7277cabc..489af45e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-01-15 Tom Tromey + * 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 49ce9004..dd35c41d 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, -- 2.43.5