From: Tom Tromey <tromey@redhat.com>
Date: Tue, 13 Jul 1999 15:05:06 +0000 (+0000)
Subject: 	* automake.in (handle_source_transform): Mark prefix as seen if
X-Git-Tag: Release-1-4b~205
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5980d994e52e7e7eed8a606a2bc22fca071ba1f8;p=automake.git

	* automake.in (handle_source_transform): Mark prefix as seen if
	corresponding _SOURCES variable exists.  Fixes empty2.test.
---

diff --git a/ChangeLog b/ChangeLog
index d139c4dc..3679be9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-13  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (handle_source_transform): Mark prefix as seen if
+	corresponding _SOURCES variable exists.  Fixes empty2.test.
+
 1999-06-25  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* configure.in (ACLOCAL): Do not prepend the variable SRCDIR to
diff --git a/TODO b/TODO
index fc0ff446..f20855f7 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 719f34a9..9c1b84af 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 '';