[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: fix another BSD Make failure (ltlibsrc.test)
From: |
Alexandre Duret-Lutz |
Subject: |
FYI: fix another BSD Make failure (ltlibsrc.test) |
Date: |
Thu, 13 May 2004 22:37:48 +0200 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux) |
I'm installing this on HEAD and branch-1-8.
2004-05-13 Alexandre Duret-Lutz <address@hidden>
* 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.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1555
diff -u -r1.1555 automake.in
--- automake.in 24 Apr 2004 19:42:20 -0000 1.1555
+++ automake.in 13 May 2004 20:35:44 -0000
@@ -1917,7 +1917,10 @@
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;
@@ -1926,6 +1929,14 @@
. "to `$default_source'.\n(Using `$old_default_source' for "
. "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);
Index: tests/ltlibsrc.test
===================================================================
RCS file: /cvs/automake/automake/tests/ltlibsrc.test,v
retrieving revision 1.3
diff -u -r1.3 ltlibsrc.test
--- tests/ltlibsrc.test 4 Dec 2003 18:07:13 -0000 1.3
+++ tests/ltlibsrc.test 13 May 2004 20:35:44 -0000
@@ -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 @@
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
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: fix another BSD Make failure (ltlibsrc.test),
Alexandre Duret-Lutz <=