[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: BUILT_SOURCES does not uses
From: |
Alexandre Duret-Lutz |
Subject: |
Re: BUILT_SOURCES does not uses |
Date: |
Sat, 24 Apr 2004 21:42:04 +0200 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (gnu/linux) |
>>> "Akim" == Akim Demaille <address@hidden> writes:
Akim> The appended test fails, pretending that LOCAL_BUILT_SOURCES is not
Akim> used, although it is, by BUILT_SOURCES. Note that the same happens
Akim> with MAINTAINERCLEANFILES. I have not tried other such magic vars.
I'm checking this in, on HEAD. Probably not what you expected, though.
2004-04-24 Alexandre Duret-Lutz <address@hidden>
* automake.in (check_typos): Clarify the diagnostic.
* tests/warnopts.test: Adjust.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1554
diff -u -r1.1554 automake.in
--- automake.in 23 Apr 2004 21:57:42 -0000 1.1554
+++ automake.in 24 Apr 2004 19:37:06 -0000
@@ -2636,9 +2636,9 @@
foreach my $primary ('_SOURCES', '_LIBADD', '_LDADD', '_LDFLAGS',
'_DEPENDENCIES')
{
- if ($varname =~ /$primary$/)
+ if ($varname =~ /^(.*)$primary$/)
{
- $check = 1;
+ $check = $1;
last;
}
}
@@ -2646,7 +2646,9 @@
for my $cond ($var->conditions->conds)
{
- msg_var 'syntax', $var, "unused variable: `$varname'"
+ msg_var ('syntax', $var, "variable `$varname' is defined but no"
+ . " program or\nlibrary has `$check' as canonic name"
+ . " (possible typo)")
unless $var->rdef ($cond)->seen;
}
}
Index: tests/warnopts.test
===================================================================
RCS file: /cvs/automake/automake/tests/warnopts.test,v
retrieving revision 1.6
diff -u -r1.6 warnopts.test
--- tests/warnopts.test 3 Jul 2003 18:58:50 -0000 1.6
+++ tests/warnopts.test 24 Apr 2004 19:37:10 -0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -56,8 +56,8 @@
grep '^sub/Makefile.am:.*INCLUDES' stderr
grep '^sub/Makefile.am:.*foo_SOURCES' stderr && exit 1
grep '^Makefile.am:.*INCLUDES' stderr && exit 1
-# Only two lines of warnings.
-test `wc -l < stderr` = 2
+# Only three lines of warnings.
+test `wc -l < stderr` = 3
# On fast machines the autom4te.cache created during the above run of
# $AUTOMAKE is likely to have the same time stamp as the configure.in
--
Alexandre Duret-Lutz