* automake.in (handle_source_transform): Also check for a

$(srcdir)/old_source rule when computing the default source name.
Propagate this $(srcdir) prefix in Automake variables.
* tests/ltlibsrc.test (noinst_LTLIBRARIES): Explicitly refer to
$(srcdir)/zoo_d_old2_la.c.  This fixes another failure with BSD Make.

diff --git a/ChangeLog b/ChangeLog
index dc3977b7e0dfed2443bb2c2be647bd9d6827067a..d17df4529108e92227d36faadae0ed4904133156 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-13  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (handle_source_transform): Also check for a
+       $(srcdir)/old_source rule when computing the default source name.
+       Propagate this $(srcdir) prefix in Automake variables.
+       * tests/ltlibsrc.test (noinst_LTLIBRARIES): Explicitly refer to
+       $(srcdir)/zoo_d_old2_la.c.  This fixes another failure with BSD Make.
+
 2004-05-13  Paul Eggert  <eggert@cs.ucla.edu>
 
        * Makefile.am (fetch): Work even with FreeBSD "make", which

diff --git a/automake.in b/automake.in
index f782105fc0aff291e95979972b449869662e64fb..882e2888cdd996884e3149814fcabbebf056f4a2 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1917,7 +1917,10 @@ sub handle_source_transform ($$$$%)
        my $old_default_source = "$one_file.c";
        (my $default_source = $unxformed) =~ s,(\.[^./\\]*)?$,.c,;
        if ($old_default_source ne $default_source
-           && (rule $old_default_source || -f $old_default_source))
+           && (rule $old_default_source
+               || rule '$(srcdir)/' . $old_default_source
+               || rule '${srcdir}/' . $old_default_source
+               || -f $old_default_source))
          {
            my $loc = $where->clone;
            $loc->pop_context;
@@ -1927,6 +1930,14 @@ sub handle_source_transform ($$$$%)
                 . "backward compatibility.)");
            $default_source = $old_default_source;
          }
+       # If a rule exists to build this source with a $(srcdir)
+       # prefix, use that prefix in our variables too.  This is for
+       # the sake of BSD Make.
+       if (rule '$(srcdir)/' . $default_source
+           || rule '${srcdir}/' . $default_source)
+         {
+           $default_source = '$(srcdir)/' . $default_source;
+         }
 
        &define_variable ($one_file . "_SOURCES", $default_source, $where);
        push (@sources, $default_source);

diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
index 8c76b197b801942da5605d3dd7fe26a17e93a202..dd7d33f704a980aed705c013754dbb268308abe7 100755 (executable)
--- a/tests/ltlibsrc.test
+++ b/tests/ltlibsrc.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -38,7 +38,7 @@ AM_LDFLAGS = -module
 pkglib_LTLIBRARIES = zoo.d/bar.la old.la
 noinst_LTLIBRARIES = foo.la zoo.d/old2.la
 
-zoo_d_old2_la.c: $(srcdir)/old_la.c
+$(srcdir)/zoo_d_old2_la.c: $(srcdir)/old_la.c
        cp $(srcdir)/old_la.c $@
 END