[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-23-gd717c2b |
|
Date: |
Sat, 06 Feb 2010 19:49:51 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=d717c2b1358c414cdfe07f5b16d5b569bc0e7608
The branch, branch-1.11 has been updated
via d717c2b1358c414cdfe07f5b16d5b569bc0e7608 (commit)
via dbfabdfc6521979678367ba9df3876fa2300da59 (commit)
via 1fd9d3935543368dbcb1481f52375e8543df0841 (commit)
via f5cb540e676da0eede37ac1c2b0b89230dd47882 (commit)
via d56acb87bb4a66c6e0baf7417166db07e4a3a95e (commit)
via 19c2941ea898413bc86e2f07b72ca219718a9eeb (commit)
via c150e6c8cd926c408d2e6003b9acb659c978fdaa (commit)
from 80c84dd087c0dbabbb7fe2f1ed0c104d639d78c7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d717c2b1358c414cdfe07f5b16d5b569bc0e7608
Merge: 19c2941ea898413bc86e2f07b72ca219718a9eeb
dbfabdfc6521979678367ba9df3876fa2300da59
Author: Ralf Wildenhues <address@hidden>
Date: Sat Feb 6 20:47:39 2010 +0100
Merge branch 'maint' into branch-1.11
commit 19c2941ea898413bc86e2f07b72ca219718a9eeb
Merge: 80c84dd087c0dbabbb7fe2f1ed0c104d639d78c7
c150e6c8cd926c408d2e6003b9acb659c978fdaa
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jan 24 12:40:29 2010 +0100
Merge branch 'je-silent' into branch-1.11
* je-silent:
Fix silent-rules output for disabled dependency tracking.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 47 ++++++++++++++++++++++++++++++++++
HACKING | 4 +-
NEWS | 12 ++++++++
THANKS | 1 +
automake.in | 12 ++++++++
doc/automake.texi | 4 +-
lib/Automake/tests/Makefile.in | 5 ++-
lib/am/check.am | 7 +++--
lib/am/depend2.am | 31 ++++++++++------------
lib/elisp-comp | 10 +++++--
lib/gnupload | 12 +++++---
lib/install-sh | 8 ++++-
lib/ylwrap | 10 +++++--
m4/depend.m4 | 9 ++++--
tests/Makefile.am | 1 +
tests/Makefile.in | 6 +++-
tests/silent4.test | 4 +-
tests/silent5.test | 19 ++++++++++---
tests/{silent3.test => silent9.test} | 12 +++++---
19 files changed, 158 insertions(+), 56 deletions(-)
copy tests/{silent3.test => silent9.test} (87%)
diff --git a/ChangeLog b/ChangeLog
index c0270c3..45950f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2010-02-06 Dmitry V. Levin <address@hidden> (tiny change)
+ Ralf Wildenhues <address@hidden>
+
+ Fix exit status of signal handlers in shell scripts.
+ The value of `$?' on entrance to signal handlers in shell scripts
+ cannot be relied upon, so set the exit code explicitly to
+ 128 + SIG<SIGNAL>.
+ * lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
+ * lib/elisp-comp: Likewise.
+ * lib/install-sh: Likewise.
+ * lib/ylwrap: Likewise. Also, fix script to trap signal 13, not 3.
+ * NEWS, THANKS: Update.
+ Bug report, analysis, and initial patch by Dmitry V. Levin.
+
+2010-02-06 Karl Berry <address@hidden>
+
+ Improve gnupload usage text.
+ * gnupload (usage): Shorten to make more likely to fit on a tty
+ line. Mention CMD in the synopsis. With ..., plural is implied.
+
+2010-01-28 Christos Kontas <address@hidden> (tiny change)
+
+ Fix some typos in the manual
+ * doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
+
+2010-01-24 Ralf Wildenhues <address@hidden>
+
+ Fix silent-rules output for disabled dependency tracking.
+ * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
+ expansion code to also work in the case where %AMDEP% expands
+ to FALSE at config.status time, using new substitution string
+ %VERBOSE-NODEP%.
+ * automake.in (verbose_nodep_flag): New function, appending
+ address@hidden@' to the verbose-variable name.
+ (handle_languages): If dependencies are not disabled, use it to
+ set %VERBOSE-NODEP%.
+ * m4/depend.m4: Substitute am__nodep as '_no', so the second
+ verbose-variable will always expand to an empty string, if
+ dependencies are enabled.
+ * tests/silent5.test: Also test --disable-dependency-tracking;
+ also test per-target flags for non-C language files.
+ * tests/silent9.test: New test, like silent4.test but disable
+ dependency tracking.
+ * tests/Makefile.am: Adjust.
+ * NEWS, THANKS: Update.
+ Report by Dmitry V. Levin <address@hidden>.
+
2010-01-17 Stefano Lattarini <address@hidden>
Slighty improve tests acoutbs.test and acoutbs2.test.
diff --git a/HACKING b/HACKING
index 64d55f9..ee85917 100644
--- a/HACKING
+++ b/HACKING
@@ -175,7 +175,7 @@
cd doc
wget
"http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh";
wget
"http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template";
- sh ./gendocs.sh automake "GNU Automake"
+ sh ./gendocs.sh --email address@hidden automake "GNU Automake"
- copy manuals recursively to web cvs,
- commit.
- Check for link errors, fix them, recheck until convergence:
@@ -188,7 +188,7 @@
-----
-Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2003, 2007, 2008, 2010 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/NEWS b/NEWS
index 2835c85..ec9a7aa 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ New in 1.11.1a:
Bugs fixed in 1.11.1a:
+* Bugs introduced by 1.11.1:
+
+* Long standing bugs:
+
+ - Several scripts as well as the parallel-tests testsuite driver now
+ exit with the right exit status upon receiving a signal.
+
Bugs fixed in 1.11.1:
@@ -12,6 +19,11 @@ Bugs fixed in 1.11.1:
- The `parallel-tests' test driver works around a GNU make 3.80 bug with
trailing white space in the test list (`TESTS = foo $(EMPTY)').
+ - The `silent-rules' option now also silences all compile rules if dependency
+ tracking is disabled. Also, when `silent-rules' is not used, the output
from
+ `make' does not contain spurious extra lines with only a backslash in them
+ any more; it now again matches that from pre-1.11 Automake.
+
* Long standing bugs:
- On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
diff --git a/THANKS b/THANKS
index d606ce2..57bb501 100644
--- a/THANKS
+++ b/THANKS
@@ -82,6 +82,7 @@ Dieter Baron address@hidden
Dieter Jurzitza address@hidden
Dilyan Palauzov address@hidden
Dmitry Mikhin address@hidden
+Dmitry V. Levin address@hidden
Doug Evans address@hidden
Duncan Gibson address@hidden
Ed Hartnett address@hidden
diff --git a/automake.in b/automake.in
index 8692d61..116fc7d 100755
--- a/automake.in
+++ b/automake.in
@@ -1183,6 +1183,14 @@ sub verbose_flag ($)
return '';
}
+sub verbose_nodep_flag ($)
+{
+ my ($name) = @_;
+ return '$(' . verbose_var ($name) . subst ('am__nodep') . ')'
+ if (option 'silent-rules');
+ return '';
+}
+
# silent_flag
# -----------
# Contents of %SILENT%: variable to expand to `@' when silent.
@@ -1380,6 +1388,8 @@ sub handle_languages
? ('FALSE', 'FALSE') : ('AMDEP', "am__fastdep$fpfx");
my $verbose = verbose_flag ($lang->ccer || 'GEN');
+ my $verbose_nodep = ($AMDEP eq 'FALSE')
+ ? $verbose : verbose_nodep_flag ($lang->ccer || 'GEN');
my $silent = silent_flag ();
my %transform = ('EXT' => $ext,
@@ -1394,6 +1404,7 @@ sub handle_languages
'DERIVED-EXT' => 'BUG',
DIST_SOURCE => 1,
VERBOSE => $verbose,
+ 'VERBOSE-NODEP' => $verbose_nodep,
SILENT => $silent,
);
@@ -1616,6 +1627,7 @@ sub handle_languages
LTOBJ => "$obj.lo",
VERBOSE => $verbose,
+ 'VERBOSE-NODEP' => $verbose_nodep,
SILENT => $silent,
COMPILE => $obj_compile,
LTCOMPILE => $obj_ltcompile,
diff --git a/doc/automake.texi b/doc/automake.texi
index 2efa645..8e8f5f6 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -1305,7 +1305,7 @@ run the @command{configure} script of B as part of its
execution,
building and installing A will also build and install B. Generating a
distribution for A will also include B.
-It is possible to gather several package like this. GCC is a heavy
+It is possible to gather several packages like this. GCC is a heavy
user of this feature. This gives installers a single package to
configure, build and install, while it allows developers to work on
subpackages independently.
@@ -8856,7 +8856,7 @@ Sometimes it is convenient to supplement the rebuild
rules for
@file{configure} or @file{config.status} with additional dependencies.
The variables @code{CONFIGURE_DEPENDENCIES} and
@code{CONFIG_STATUS_DEPENDENCIES} can be used to list these extra
-dependencies. These variable should be defined in all
+dependencies. These variables should be defined in all
@file{Makefile}s of the tree (because these two rebuild rules are
output in all them), so it is safer and easier to @code{AC_SUBST} them
from @file{configure.ac}. For instance, the following statement will
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 0703c55..4539c9f 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -129,8 +129,9 @@ $(am__sh_e_setup); \
$(am__vpath_adj_setup) $(am__vpath_adj) \
srcdir=$(srcdir); export srcdir; \
rm -f address@hidden; \
-trap 'st=$$?; rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit
$$st' \
- 1 2 13 15; \
+am__trap='rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit
$$st'; \
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2; \
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`; \
test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?; \
if test -f "./$$f"; then dir=./; \
diff --git a/lib/am/check.am b/lib/am/check.am
index b1d1aad..755bf13 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009 Free Software
+## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009, 2010 Free Software
## Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -101,8 +101,9 @@ $(am__sh_e_setup); \
$(am__vpath_adj_setup) $(am__vpath_adj) \
srcdir=$(srcdir); export srcdir; \
rm -f address@hidden; \
-trap 'st=$$?; rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit
$$st' \
- 1 2 13 15; \
+am__trap='rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit
$$st'; \
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2; \
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`; \
test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?; \
if test -f "./$$f"; then dir=./; \
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 3674fee..9a193a4 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
+## 2003, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -71,18 +71,17 @@ if %FASTDEP%
?GENERIC??SUBDIROBJ? %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o
%OBJ% %SOURCEFLAG%%SOURCE% &&\
?GENERIC??SUBDIROBJ? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
else !%FASTDEP%
-?VERBOSE? %VERBOSE% @AM_BACKSLASH@
if %AMDEP%
- source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+ %VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
-?-o? %COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%%SOURCE%
-?!-o? %COMPILE% %-c% %SOURCEFLAG%%SOURCE%
+?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%%SOURCE%
+?!-o? %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%%SOURCE%
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o? %COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%
-?!-o? %COMPILE% %-c% %SOURCEFLAG%`test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%
+?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%`test -f
'%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!-o? %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%`test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%
endif !%?GENERIC%
endif !%FASTDEP%
@@ -99,18 +98,17 @@ if %FASTDEP%
?GENERIC??SUBDIROBJ? %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c%
-o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` &&\
?GENERIC??SUBDIROBJ? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
else !%FASTDEP%
-?VERBOSE? %VERBOSE% @AM_BACKSLASH@
if %AMDEP%
- source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+ %VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
-?-o? %COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
-?!-o? %COMPILE% %-c% `$(CYGPATH_W) %SOURCEFLAG%'%SOURCE%'`
+?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W)
'%SOURCE%'`
+?!-o? %VERBOSE-NODEP%%COMPILE% %-c% `$(CYGPATH_W) %SOURCEFLAG%'%SOURCE%'`
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o? %COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then
$(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?!-o? %COMPILE% %-c% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W)
'%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`if test -f
'%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W)
'$(srcdir)/%SOURCE%'; fi`
+?!-o? %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%`if test -f '%SOURCE%'; then
$(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
endif !%?GENERIC%
endif !%FASTDEP%
endif %?NONLIBTOOL%
@@ -129,14 +127,13 @@ if %FASTDEP%
?GENERIC??SUBDIROBJ? %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c%
-o %LTOBJ% %SOURCEFLAG%%SOURCE% &&\
?GENERIC??SUBDIROBJ? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
else !%FASTDEP%
-?VERBOSE? %VERBOSE% @AM_BACKSLASH@
if %AMDEP%
- source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+ %VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
## We can always use `-o' with Libtool.
-?GENERIC? %LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
+?GENERIC? %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' ||
echo '$(srcdir)/'`%SOURCE%
+?!GENERIC? %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%`test -f
'%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
endif !%FASTDEP%
endif %?LIBTOOL%
diff --git a/lib/elisp-comp b/lib/elisp-comp
index ce8c82c..ecc6b15 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -1,8 +1,8 @@
#!/bin/sh
-# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009 Free Software
+# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
# Foundation, Inc.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-06.18; # UTC
# Franc,ois Pinard <address@hidden>, 1995.
#
@@ -65,7 +65,11 @@ tempdir=elc.$$
# Cleanup the temporary directory on exit.
trap 'ret=$?; rm -rf "$tempdir" && exit $ret' 0
-trap '(exit $?); exit' 1 2 13 15
+do_exit='(exit $ret); exit $ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
mkdir $tempdir
cp "$@" $tempdir
diff --git a/lib/gnupload b/lib/gnupload
index bd120e8..511070a 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,9 +1,10 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2009-12-21.21; # UTC
+scriptversion=2010-02-06.18; # UTC
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,10 +33,11 @@ delete_symlinks=
collect_var=
dbg=
-usage="Usage: $0 [OPTIONS]... [COMMAND] FILES... [[COMMAND] FILES...]
+usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
-Sign all FILES, and upload them to selected destinations, according to
-<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>.
+Sign all FILES, and process them at selected destinations according to CMD.
+<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
+explains further.
Commands:
--delete delete FILES from destination
diff --git a/lib/install-sh b/lib/install-sh
index 6781b98..3f83ce9 100755
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-06.18; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -200,7 +200,11 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
diff --git a/lib/ylwrap b/lib/ylwrap
index 84d5634..92b2011 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,10 +1,10 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-06.18; # UTC
# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009 Free Software Foundation, Inc.
+# 2007, 2009, 2010 Free Software Foundation, Inc.
#
# Written by Tom Tromey <address@hidden>.
#
@@ -99,7 +99,11 @@ esac
# FIXME: add hostname here for parallel makes that run commands on
# other machines. But that might take us over the 14-char limit.
dirname=ylwrap$$
-trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit
$ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
mkdir $dirname || exit 1
cd $dirname
diff --git a/m4/depend.m4 b/m4/depend.m4
index efe8643..8304180 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,12 +1,12 @@
## -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 11
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -175,8 +175,11 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c160028..3b4c850 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -605,6 +605,7 @@ silent4.test \
silent5.test \
silent6.test \
silent7.test \
+silent9.test \
sinclude.test \
srcsub.test \
srcsub2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 870a218..eced3e7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -132,8 +132,9 @@ $(am__sh_e_setup); \
$(am__vpath_adj_setup) $(am__vpath_adj) \
srcdir=$(srcdir); export srcdir; \
rm -f address@hidden; \
-trap 'st=$$?; rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit
$$st' \
- 1 2 13 15; \
+am__trap='rm -f '\''$(abs_builddir)/address@hidden'\''; (exit $$st); exit
$$st'; \
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2; \
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`; \
test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?; \
if test -f "./$$f"; then dir=./; \
@@ -839,6 +840,7 @@ silent4.test \
silent5.test \
silent6.test \
silent7.test \
+silent9.test \
sinclude.test \
srcsub.test \
srcsub2.test \
diff --git a/tests/silent4.test b/tests/silent4.test
index 37e690c..3fd9f65 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
# Check silent-rules mode, with libtool, non-fastdep case
# (so that, with GCC, we also cover the other code paths in depend2).
-# Please keep this file in sync with silent3.test.
+# Please keep this file in sync with silent3.test and silent9.test.
required="libtoolize gcc"
. ./defs
diff --git a/tests/silent5.test b/tests/silent5.test
index 8d517be..1f06cf0 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -37,9 +37,13 @@ EOF
cat > Makefile.am <<'EOF'
# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar
+bin_PROGRAMS = foo bar fo2
bar_CFLAGS = $(AM_CFLAGS)
foo_SOURCES = foo1.cpp foo2.f90 foo3.f foo5.l foo6.y
+fo2_SOURCES = $(foo_SOURCES)
+fo2_CPPFLAGS = $(AM_CPPFLAGS)
+fo2_FFLAGS = $(AM_FFLAGS)
+fo2_FCFLAGS = $(AM_FCFLAGS)
SUBDIRS = sub
AM_YFLAGS = -d
LDADD = $(LEXLIB)
@@ -49,9 +53,13 @@ EOF
cat > sub/Makefile.am <<'EOF'
AUTOMAKE_OPTIONS = subdir-objects
# Need generic and non-generic rules.
-bin_PROGRAMS = baz bla
+bin_PROGRAMS = baz bla ba2
bla_CFLAGS = $(AM_CFLAGS)
baz_SOURCES = baz1.cpp baz2.f90 baz3.f baz5.l baz6.y
+ba2_SOURCES = $(baz_SOURCES)
+ba2_CPPFLAGS = $(AM_CPPFLAGS)
+ba2_FFLAGS = $(AM_FFLAGS)
+ba2_FCFLAGS = $(AM_FCFLAGS)
AM_YFLAGS = -d
LDADD = $(LEXLIB)
BUILT_SOURCES = baz6.h
@@ -100,8 +108,9 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-# configure once for fastdep, once for non-fastdep
-for config_args in '' am_cv_CC_dependencies_compiler_type=gcc
+# configure once for fastdep, once for non-fastdep, once for nodep
+for config_args in '' am_cv_CC_dependencies_compiler_type=gcc \
+ --disable-dependency-tracking
do
./configure $config_args --enable-silent-rules
$MAKE >stdout || { cat stdout; Exit 1; }
diff --git a/tests/silent3.test b/tests/silent9.test
similarity index 87%
copy from tests/silent3.test
copy to tests/silent9.test
index 70023ec..6be0f98 100755
--- a/tests/silent3.test
+++ b/tests/silent9.test
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,11 +14,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check silent-rules mode, with libtool, standard depmode case.
+# Check silent-rules mode, with libtool, nodep case.
-# Please keep this file in sync with silent4.test.
+# Please keep this file in sync with silent3.test and silent4.test.
-required=libtoolize
+required="libtoolize"
. ./defs
set -e
@@ -63,7 +63,7 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-./configure --enable-silent-rules
+./configure --disable-dependency-tracking --enable-silent-rules
$MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
grep ' -c' stdout && Exit 1
@@ -92,4 +92,6 @@ grep ' CCLD .*bar' stdout && Exit 1
grep ' CCLD .*baz' stdout && Exit 1
grep ' CCLD .*bla' stdout && Exit 1
+$MAKE distclean
+
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-23-gd717c2b,
Ralf Wildenhues <=