From 69db500cb06caf272f5199f56079fb5c703b360c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 13 Jul 1999 15:05:09 +0000 Subject: [PATCH] * automake.in (handle_source_transform): Mark prefix as seen if corresponding _SOURCES variable exists. Fixes empty2.test. --- ChangeLog | 5 +++++ TODO | 2 ++ automake.in | 12 ++++-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d139c4dc3..3679be9d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-07-13 Tom Tromey + + * automake.in (handle_source_transform): Mark prefix as seen if + corresponding _SOURCES variable exists. Fixes empty2.test. + 1999-06-25 OKUJI Yoshinori * configure.in (ACLOCAL): Do not prepend the variable SRCDIR to diff --git a/TODO b/TODO index fc0ff446e..f20855f72 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,8 @@ Make it an error when the user tries to do this This must be done for 1.5 +* support prog_LIBS as override for LIBS + * serious bug. this doesn't work: .c.o: ; ... foo.o: sub/foo.c diff --git a/automake.in b/automake.in index 719f34a9a..9c1b84af4 100755 --- a/automake.in +++ b/automake.in @@ -1443,6 +1443,10 @@ sub handle_source_transform local ($var) = $prefix . $one_file . "_SOURCES"; if (&variable_defined ($var)) { + # Keep track of which prefixes we saw. + $used_pfx{$xpfx} = 1 + unless $prefix =~ /EXTRA_/; + push (@sources, '$(' . $prefix . $one_file . "_SOURCES)"); push (@objects, '$(' . $xpfx . $one_file . "_OBJECTS)") unless $prefix =~ /EXTRA_/; @@ -1470,10 +1474,6 @@ sub handle_source_transform unless $prefix =~ /EXTRA_/; } - # Keep track of which prefixes we saw. - $used_pfx{$xpfx} = 1 - unless $prefix =~ /EXTRA_/; - next; } } @@ -1481,10 +1481,6 @@ sub handle_source_transform # Avoid defining needless variables. next if (scalar @files == 0); - # Keep track of which prefixes we saw. - $used_pfx{$xpfx} = 1 - unless $prefix =~ /EXTRA_/; - ($temp, @result) = &handle_single_transform_list ($one_file, $obj, @files); $linker = $temp if $linker eq ''; -- 2.47.2