* automake.in (handle_source_transform): Mark prefix as seen if

	corresponding _SOURCES variable exists.  Fixes empty2.test.

diff --git a/ChangeLog b/ChangeLog
index d139c4dc37b880ef00fdae7d6ac43265a5ba0301..3679be9d8919622c7c8c45f22e8996d445ef60a4 100644 (file)
--- 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 fc0ff446e2cf55a761785196973a9d100bdd040a..f20855f7288cbc35630e00273cf25e22991620b8 100644 (file)
--- 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 719f34a9a12f423e76f8a130a112f7bf7639f1d8..9c1b84af4d83070971c2a7b547a56a0b1406b56b 100755 (executable)
--- 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 '';