[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-261-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-261-gf54a09c |
|
Date: |
Sat, 26 Jun 2010 20:25:48 +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=f54a09c3ab5e8d81fb50ff66a3d333f5172f9c6e
The branch, master has been updated
via f54a09c3ab5e8d81fb50ff66a3d333f5172f9c6e (commit)
via 9b72d6688f5a1897db8f9d1fb85f3a9c77046bd8 (commit)
via 10152e93dd159a04e1f9efc4388cc80d33a5f8ef (commit)
via 799d28297f59f47324fb7d72788c1a7a2f79173b (commit)
via 76d8a53ec09af4a05b64fd220a4cc1d5c4bdb1b5 (commit)
via e1030a6aca63207c15c2217bb56d038eef298ad4 (commit)
from 4d3079b085f1de75aa9a8bc91d8a63232bd89619 (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 f54a09c3ab5e8d81fb50ff66a3d333f5172f9c6e
Merge: 4d3079b 9b72d66
Author: Ralf Wildenhues <address@hidden>
Date: Sat Jun 26 22:23:31 2010 +0200
Merge branch 'maint'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 50 +++++++++++++++++++++
Makefile.am | 8 ++-
Makefile.in | 4 +-
aclocal.in | 5 ++-
automake.in | 6 ++-
configure | 2 +
configure.ac | 3 +
doc/automake.texi | 100 ++++++++++++++++++++++---------------------
lib/Automake/ChannelDefs.pm | 6 +-
lib/Automake/Config.in | 7 ++-
lib/Automake/Makefile.am | 5 +-
lib/Automake/Makefile.in | 5 +-
tests/lex3.test | 5 +-
tests/lex5.test | 6 +-
tests/multlib.test | 6 +-
tests/pr279-2.test | 4 +-
tests/pr279.test | 4 +-
tests/silent5.test | 2 +-
tests/specflg3.test | 4 +-
tests/subobj10.test | 4 +-
tests/subobj9.test | 4 +-
tests/target-cflags.test | 5 +-
22 files changed, 157 insertions(+), 88 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 863d271..4366381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2010-06-26 Ralf Wildenhues <address@hidden>
+
+ Update program --help output to match current GCS.
+ * configure.ac: Set and substitute PACKAGE_URL if AC_PACKAGE_URL
+ is not defined, for compatibility to Autoconf < 2.64.
+ * Makefile.am (do_subst): Substitute PACKAGE_BUGREPORT and
+ PACKAGE_URL.
+ (sc_diff_automake_in_automake): Update number of diff lines for
+ additional substitutions.
+ * aclocal.in (usage): Use PACKAGE_BUGREPORT. Point to Automake
+ home page and GNU general help page.
+ * automake.in (usage): Likewise.
+ * doc/automake.texi: New flag PACKAGE_BUGREPORT, to factor email
+ address.
+ (Introduction, Creating amhello, amhello Explained, Options):
+ Use it throughout.
+ * lib/Automake/Makefile.am (do_subst): Substitute
+ PACKAGE_BUGREPORT.
+ * lib/Automake/Config.in ($PACKAGE_BUGREPORT): New global.
+ * lib/Automake/ChannelDefs.pm: Use it for footer of fatal
+ messages.
+
+ Clean up @var handling in the manual.
+ * doc/automake.texi: Throughout the manual, lower-case @var
+ names, replace a few one-character names.
+
+2010-06-26 Stefano Lattarini <address@hidden>
+
+ Fix typo-related bug in test script silent5.test.
+ * tests/silent5.test: Use $EGREP, not $GREP (which is not even
+ defined).
+
+ Tests: remove useless repetitions of `foreign' automake option.
+ * tests/multlib.test (configure.in): Remove useless use of
+ `foreign' option in AM_INIT_AUTOMAKE (the `--foreign' option is
+ already in $AUTOMAKE by default, so no point in repeating it).
+ * tests/subobj10.test: Likewise.
+ * tests/subobj9.test: Likewise.
+ * tests/lex3.test (Makefile.am): Similarly, remove useless use
+ of `foreign' option in AUTOMAKE_OPTIONS.
+ * tests/lex5.test: Likewise.
+ * tests/pr279.test: Likewise.
+ * tests/pr279-2.test: Likewise.
+ * tests/specflg3.test: Likewise.
+ * tests/target-cflags.test: Likewise.
+
+ Drop useless requirement "gzip" in lex5.test.
+ * tests/lex5.test ($required): Do not list "gzip", as it's
+ never used.
+
2010-06-24 Stefano Lattarini <address@hidden>
Fix bugs in test script silent5.test.
diff --git a/Makefile.am b/Makefile.am
index 87091bc..3dd2a18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,8 @@ uninstall-hook:
do_subst = sed \
-e 's,address@hidden@],$(APIVERSION),g' \
-e 's,address@hidden@],$(PACKAGE),g' \
+ -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
+ -e 's,address@hidden@],$(PACKAGE_URL),g' \
-e 's,address@hidden@],$(PATH_SEPARATOR),g' \
-e 's,address@hidden@],$(PERL),g' \
-e 's,address@hidden@],$(PERL_THREADS),g' \
@@ -202,10 +204,10 @@ $(syntax_check_rules): automake aclocal
maintainer-check: $(syntax_check_rules)
## This check avoids accidental configure substitutions in the source.
-## There are exactly 6 lines that should be modified. This works out
-## to 22 lines of diffs.
+## There are exactly 8 lines that should be modified. This works out
+## to 28 lines of diffs.
sc_diff_automake_in_automake:
- @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
+ @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
echo "found too many diffs between automake.in and automake" 1>&2; \
diff -c $(srcdir)/automake.in automake; \
exit 1; \
diff --git a/Makefile.in b/Makefile.in
index b4f4b3e..3a89eba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -265,6 +265,8 @@ EXTRA_DIST = \
do_subst = sed \
-e 's,address@hidden@],$(APIVERSION),g' \
-e 's,address@hidden@],$(PACKAGE),g' \
+ -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
+ -e 's,address@hidden@],$(PACKAGE_URL),g' \
-e 's,address@hidden@],$(PATH_SEPARATOR),g' \
-e 's,address@hidden@],$(PERL),g' \
-e 's,address@hidden@],$(PERL_THREADS),g' \
@@ -967,7 +969,7 @@ $(syntax_check_rules): automake aclocal
maintainer-check: $(syntax_check_rules)
sc_diff_automake_in_automake:
- @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
+ @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
echo "found too many diffs between automake.in and automake" 1>&2; \
diff -c $(srcdir)/automake.in automake; \
exit 1; \
diff --git a/aclocal.in b/aclocal.in
index 182e4f7..4c81a47 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -896,7 +896,10 @@ Warning categories include:
`none' turn off all the warnings
`error' treat warnings as errors
-Report bugs to <address@hidden>.\n";
+" . 'Report bugs to <@PACKAGE_BUGREPORT@>.
+GNU Automake home page: <@PACKAGE_URL@>.
+General help using GNU software: <http://www.gnu.org/gethelp/>.
+';
exit $status;
}
diff --git a/automake.in b/automake.in
index baab721..97280a9 100644
--- a/automake.in
+++ b/automake.in
@@ -8417,7 +8417,11 @@ Library files:
write;
}
- print "\nReport bugs to <address@hidden>.\n";
+ print '
+Report bugs to <@PACKAGE_BUGREPORT@>.
+GNU Automake home page: <@PACKAGE_URL@>.
+General help using GNU software: <http://www.gnu.org/gethelp/>.
+';
# --help always returns 0 per GNU standards.
exit 0;
diff --git a/configure b/configure
index 2637fe3..b52bf2b 100755
--- a/configure
+++ b/configure
@@ -1701,6 +1701,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
ac_aux_dir=
for ac_dir in lib "$srcdir"/lib; do
for ac_t in install-sh install.sh shtool; do
diff --git a/configure.ac b/configure.ac
index bb22e1c..079525d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,9 @@
AC_INIT([GNU Automake], [1.11a], address@hidden)
+m4_ifndef([AC_PACKAGE_URL],
+ [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])])
+
AC_CONFIG_SRCDIR(automake.in)
AC_CONFIG_AUX_DIR(lib)
diff --git a/doc/automake.texi b/doc/automake.texi
index f7f3507..9f5b3bd 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -15,6 +15,8 @@
@address@hidden@r{]}
@end macro
address@hidden PACKAGE_BUGREPORT bug-automake@@gnu.org
+
@copying
This manual is for GNU Automake (version @value{VERSION},
@@ -422,7 +424,7 @@ to be built.
@cindex E-mail, bug reports
Mail suggestions and bug reports for Automake to
address@hidden@@gnu.org}.
address@hidden@value{PACKAGE_BUGREPORT}}.
@node Autotools Introduction
@chapter An Introduction to the Autotools
@@ -1017,11 +1019,11 @@ resulting executable is expected to run. The following
@command{configure} options are used to specify each of them:
@table @option
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
The system on which the package is built.
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
The system where built programs and libraries will run.
@end table
@@ -1067,15 +1069,15 @@ built is itself a cross-compiler: we need a third
option to specify
its target architecture.
@table @option
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
address@hidden address@hidden
When building compiler tools: the system for which the tools will
create output.
@end table
For instance when installing GCC, the GNU Compiler Collection, we can
-use @option{--target=@/@var{TARGET}} to specify that we want to build
-GCC as a cross-compiler for @var{TARGET}. Mixing @option{--build} and
+use @option{--target=@/@var{target}} to specify that we want to build
+GCC as a cross-compiler for @var{target}. Mixing @option{--build} and
@option{--target}, we can actually cross-compile a cross-compiler;
such a three-way cross-compilation is known as a @dfn{Canadian cross}.
@@ -1100,15 +1102,15 @@ distinguish it from your vendor's @command{tar}.
This can be done using one of these three @command{configure} options.
@table @option
address@hidden address@hidden
address@hidden address@hidden
-Prepend @var{PREFIX} to installed program names.
address@hidden address@hidden
address@hidden address@hidden
-Append @var{SUFFIX} to installed program names.
address@hidden address@hidden
address@hidden address@hidden
-Run @code{sed @var{PROGRAM}} on installed program names.
address@hidden address@hidden
address@hidden address@hidden
+Prepend @var{prefix} to installed program names.
address@hidden address@hidden
address@hidden address@hidden
+Append @var{suffix} to installed program names.
address@hidden address@hidden
address@hidden address@hidden
+Run @code{sed @var{program}} on installed program names.
@end table
The following commands would install @file{hello}
@@ -1444,7 +1446,7 @@ create the @command{configure} script.
@example
~/amhello % @kbd{cat configure.ac}
-AC_INIT([amhello], [1.0], [bug-automake@@gnu.org])
+AC_INIT([amhello], [1.0], address@hidden)
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC
AC_CONFIG_HEADERS([config.h])
@@ -1549,7 +1551,7 @@ direct you to the right manual when seeking answers.
Let us begin with the contents of @file{configure.ac}.
@example
-AC_INIT([amhello], [1.0], [bug-automake@@gnu.org])
+AC_INIT([amhello], [1.0], address@hidden)
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC
AC_CONFIG_HEADERS([config.h])
@@ -1619,7 +1621,7 @@ is an excerpt of @file{config.h} after
@command{configure} has run:
@smallexample
@dots{}
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "bug-automake@@gnu.org"
+#define PACKAGE_BUGREPORT "@value{PACKAGE_BUGREPORT}"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "amhello 1.0"
@@ -3137,7 +3139,7 @@ output file.
@cindex serial number and @option{--install}
When this option is used, and only when this option is used,
address@hidden will also honor @samp{#serial @var{NUMBER}} lines
address@hidden will also honor @samp{#serial @var{number}} lines
that appear in macros: an M4 file is ignored if there exists another
M4 file with the same basename and a greater serial number in the
search path (@pxref{Serials}).
@@ -3532,11 +3534,11 @@ automatically when new system-wide versions are
installed. A serial
number should be a single line of the form
@example
-#serial @var{NNN}
+#serial @var{nnn}
@end example
@noindent
-where @var{NNN} contains only digits and dots. It should appear in
+where @var{nnn} contains only digits and dots. It should appear in
the M4 file before any macro definition. It is a good practice to
maintain a serial number for each macro you distribute, even if you do
not use the @option{--install} option of @command{aclocal}: this allows
@@ -5314,7 +5316,7 @@ options and generic options. Mode-specific options such
as the
aforementioned linking flags should be lumped with the other flags
passed to the tool invoked by @command{libtool} (hence the use of
@address@hidden for libtool linking flags). Generic
-options include @address@hidden and @option{--silent}
+options include @address@hidden and @option{--silent}
(@pxref{Invoking libtool, , Invoking @command{libtool}, libtool, The
Libtool Manual} for more options) should appear before the mode
selection on the command line; in @file{Makefile.am}s they should
@@ -5323,10 +5325,10 @@ be listed in the @address@hidden variable.
If @address@hidden is not defined, then the variable
@code{AM_LIBTOOLFLAGS} is used instead.
-These flags are passed to libtool after the @address@hidden
+These flags are passed to libtool after the @address@hidden
option computed by Automake (if any), so
@address@hidden (or @code{AM_LIBTOOLFLAGS}) is a
-good place to override or supplement the @address@hidden
+good place to override or supplement the @address@hidden
setting.
The libtool rules also use a @code{LIBTOOLFLAGS} variable that should
@@ -5573,7 +5575,7 @@ or a shared library. It overrides the @code{AM_LDFLAGS}
variable.
@item maude_LIBTOOLFLAGS
This variable is used to pass extra options to @command{libtool}.
It overrides the @code{AM_LIBTOOLFLAGS} variable.
-These options are output before @command{libtool}'s @address@hidden
+These options are output before @command{libtool}'s @address@hidden
option, so they should not be mode-specific options (those belong to
the compiler or linker flags). @xref{Libtool Flags}.
@@ -5755,8 +5757,8 @@ Without the last line, they will be built from
@file{test1.c},
@cindex Libtool modules, default source example
@cindex default source, Libtool modules example
Another case where this is convenient is building many Libtool modules
-(@address@hidden), each defined in its own file
-(@address@hidden).
+(@address@hidden), each defined in its own file
+(@address@hidden).
@example
AM_LDFLAGS = -module
@@ -6556,8 +6558,8 @@ library.
@comment node-name, next, previous, up
@subsection Compiling Fortran 9x Files
address@hidden@var{N}.o} is made automatically from @address@hidden,
address@hidden@var{N}.f95}, @address@hidden, or @address@hidden
address@hidden@var{file}.o} is made automatically from @address@hidden,
address@hidden@var{file}.f95}, @address@hidden, or @address@hidden
by running the Fortran 9x compiler. The precise command used
is as follows:
@@ -6639,7 +6641,7 @@ Automake ships with an Autoconf macro called
@code{AM_PROG_VALAC}
that will locate the Vala compiler and optionally check its version
number.
address@hidden AM_PROG_VALAC (@ovar{MINIMUM-VERSION})
address@hidden AM_PROG_VALAC (@ovar{minimum-version})
Try to find a Vala compiler in @env{PATH}. If it is found, the variable
@code{VALAC} is set. Optionally a minimum release number of the compiler
can be requested:
@@ -7537,17 +7539,17 @@ files in your @file{Makefile.am}, depending on where
you want your files
installed (see the definitions of @code{pythondir} and
@code{pkgpythondir} below).
address@hidden AM_PATH_PYTHON (@ovar{VERSION}, @ovar{ACTION-IF-FOUND},
@ovar{ACTION-IF-NOT-FOUND})
address@hidden AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found},
@ovar{action-if-not-found})
Search for a Python interpreter on the system. This macro takes three
optional arguments. The first argument, if present, is the minimum
version of Python required for this package: @code{AM_PATH_PYTHON}
-will skip any Python interpreter that is older than @var{VERSION}.
-If an interpreter is found and satisfies @var{VERSION}, then
address@hidden is run. Otherwise, @var{ACTION-IF-NOT-FOUND} is
+will skip any Python interpreter that is older than @var{version}.
+If an interpreter is found and satisfies @var{version}, then
address@hidden is run. Otherwise, @var{action-if-not-found} is
run.
-If @var{ACTION-IF-NOT-FOUND} is not specified, as in the following
+If @var{action-if-not-found} is not specified, as in the following
example, the default is to abort @command{configure}.
@example
@@ -7572,7 +7574,7 @@ the Python installation found during configuration.
The name of the Python executable, or @samp{:} if no suitable
interpreter could be found.
-Assuming @var{ACTION-IF-NOT-FOUND} is used (otherwise @file{./configure}
+Assuming @var{action-if-not-found} is used (otherwise @file{./configure}
will abort if Python is absent), the value of @code{PYTHON} can be used
to setup a conditional in order to disable the relevant part of a build
as follows.
@@ -7873,8 +7875,8 @@ subdirectory of @code{mandir}. Valid section names are
the digits
Sometimes developers prefer to name a man page something like
@file{foo.man} in the source, and then rename it to have the correct
suffix, for example @file{foo.1}, when installing the file. Automake
-also supports this mode. For a valid section named @var{SECTION},
-there is a corresponding directory named @address@hidden,
+also supports this mode. For a valid section named @var{section},
+there is a corresponding directory named @address@hidden,
and a corresponding @code{_MANS} variable. Files listed in such a
variable are installed in the indicated section. If the file already
has a valid suffix, then it is installed as-is; otherwise the file
@@ -7904,7 +7906,7 @@ installed by default. The user can still explicitly
install them via
@samp{make install-man}.
For fast installation, with many files it is preferable to use
address@hidden@var{SECTION}_MANS} over @samp{man_MANS} as well as files that
address@hidden@var{section}_MANS} over @samp{man_MANS} as well as files that
do not need to be renamed.
Man pages are not currently considered to be source, because it is not
@@ -8613,10 +8615,10 @@ if a test file name ends in several concatenated
suffixes.
@vindex LOG_COMPILE
@vindex LOG_COMPILER
@vindex LOG_FLAGS
address@hidden @var{EXT}_LOG_COMPILE
address@hidden @var{EXT}_LOG_COMPILER
address@hidden @var{EXT}_LOG_FLAGS
address@hidden address@hidden
address@hidden @var{ext}_LOG_COMPILE
address@hidden @var{ext}_LOG_COMPILER
address@hidden @var{ext}_LOG_FLAGS
address@hidden address@hidden
@vindex AM_LOG_FLAGS
For tests that match an extension @address@hidden listed in
@code{TEST_EXTENSIONS}, you can provide a test driver using the variable
@@ -9120,10 +9122,10 @@ Enable test suite driver for @code{TESTS} that can run
tests in parallel
If this release is an alpha release, and the file @file{README-alpha}
exists, then it will be added to the distribution. If this option is
given, version numbers are expected to follow one of two forms. The
-first form is @address@hidden@address@hidden, where each
+first form is @address@hidden@address@hidden, where each
element is a number; the final period and number should be left off for
non-alpha releases. The second form is
address@hidden@address@hidden@var{ALPHA}}, where @var{ALPHA} is a
address@hidden@address@hidden@var{alpha}}, where @var{alpha} is a
letter; it should be omitted for non-alpha releases.
@item @option{silent-rules}
@@ -9299,7 +9301,7 @@ directory separator in two parts, first of them being at
most 155
bytes long. So, in most cases the maximum file name length will be
shorter than 256 characters. However you may run against broken tar
implementations that incorrectly handle file names longer than 99
-characters (please report them to @email{bug-automake@@gnu.org} so we
+characters (please report them to @address@hidden so we
can document this accurately).
@option{tar-pax} selects the new pax interchange format defined by POSIX
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index acb3ae8..57948bd 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2002, 2003, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2003, 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
@@ -148,7 +148,7 @@ register_channel 'automake', type => 'fatal', backtrace =>
1,
header => ("####################\n" .
"## Internal Error ##\n" .
"####################\n"),
- footer => "\nPlease contact <address@hidden>.",
+ footer => "\nPlease contact <$PACKAGE_BUGREPORT>.",
uniq_part => UP_NONE, ordered => 0;
register_channel 'gnu', type => 'warning';
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 29a184f..7e87044 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2004, 2008 Free Software Foundation, Inc. -*- Perl -*-
+# -*- Perl -*-
+# Copyright (C) 2003, 2004, 2008, 2010 Free Software Foundation, Inc.
# @configure_input@
# This program is free software; you can redistribute it and/or modify
@@ -21,12 +22,14 @@ use 5.006;
require Exporter;
our @ISA = qw (Exporter);
-our @EXPORT = qw ($APIVERSION $PACKAGE $VERSION $libdir $perl_threads);
+our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_BUGREPORT $VERSION $libdir
+ $perl_threads);
# Parameters set by configure. Not to be changed. NOTE: assign
# VERSION as string so that e.g. version 0.30 will print correctly.
our $APIVERSION = '@APIVERSION@';
our $PACKAGE = '@PACKAGE@';
+our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
our $libdir = '@datadir@/@address@hidden@APIVERSION@';
our $perl_threads = @PERL_THREADS@;
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index c0b536c..e4c2572 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to create Makefile.in
-# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 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
@@ -52,6 +52,7 @@ CLEANFILES = $(nodist_perllib_DATA)
do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
-e 's,address@hidden@],$(APIVERSION),g' \
-e 's,address@hidden@],$(PACKAGE),g' \
+ -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
-e 's,address@hidden@],$(PERL),g' \
-e 's,address@hidden@],$(PERL_THREADS),g' \
-e 's,address@hidden@],$(SHELL),g' \
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index e434809..b79c132 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -15,8 +15,8 @@
@SET_MAKE@
-# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 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
@@ -261,6 +261,7 @@ CLEANFILES = $(nodist_perllib_DATA)
do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
-e 's,address@hidden@],$(APIVERSION),g' \
-e 's,address@hidden@],$(PACKAGE),g' \
+ -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
-e 's,address@hidden@],$(PERL),g' \
-e 's,address@hidden@],$(PERL_THREADS),g' \
-e 's,address@hidden@],$(SHELL),g' \
diff --git a/tests/lex3.test b/tests/lex3.test
index 59146c7..178a54f 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 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
@@ -38,9 +39,7 @@ AC_OUTPUT(Makefile)
END
cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
LDADD = @LEXLIB@
-
noinst_PROGRAMS = foo
foo_SOURCES = foo.l
END
diff --git a/tests/lex5.test b/tests/lex5.test
index edbdf9d..88924b2 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 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
@@ -16,7 +16,7 @@
# Test for subdir lexers.
-required='gcc GNUmake gzip flex'
+required='gcc GNUmake flex'
. ./defs || Exit 1
set -e
@@ -33,7 +33,7 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects
LDADD = @LEXLIB@
bin_PROGRAMS = foo/foo
diff --git a/tests/multlib.test b/tests/multlib.test
index 65b3fd4..5ff19d7 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 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
@@ -64,7 +64,7 @@ AC_CONFIG_SRCDIR(foo.c)
# Apparently it doesn't work to have auxdir=.. when
# multilib uses symlinked trees.
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(foreign)
+AM_INIT_AUTOMAKE
AC_PROG_CC
AC_PROG_RANLIB
AM_ENABLE_MULTILIB(Makefile,[..])
@@ -87,7 +87,7 @@ AC_INIT(libbar, 0.1, address@hidden)
# Apparently it doesn't work to have auxdir=.. when
# multilib uses symlinked trees.
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(foreign)
+AM_INIT_AUTOMAKE
AC_PROG_CC
AC_PROG_RANLIB
AM_ENABLE_MULTILIB(Makefile,[..])
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index 1d1e675..286e33a 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -28,8 +28,6 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
-
if FOOTEST
foo_LDADD = zardoz
else
diff --git a/tests/pr279.test b/tests/pr279.test
index b7ec641..50dff53 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -28,8 +28,6 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
-
if FOOTEST
xtralib =
else
diff --git a/tests/silent5.test b/tests/silent5.test
index 4a9c4c1..e29f48f 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -80,7 +80,7 @@ do_and_check_verbose_build ()
grep ' -c ' stdout
grep ' -o ' stdout
- $GREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
+ $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
if $rebuild; then :; else
grep 'ylwrap ' stdout
diff --git a/tests/specflg3.test b/tests/specflg3.test
index 53793a1..60006a5 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2004, 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
@@ -27,7 +28,6 @@ AC_OUTPUT(Makefile)
END
cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = foo
foo_SOURCES = foo.c
foo_CFLAGS = -DFOO
diff --git a/tests/subobj10.test b/tests/subobj10.test
index c9c129d..a589e45 100755
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 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
@@ -23,7 +23,7 @@ set -e
cat > configure.in << 'END'
AC_INIT(x, 0, x)
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([subdir-objects])
AM_PROG_AS
AC_PROG_RANLIB
diff --git a/tests/subobj9.test b/tests/subobj9.test
index 99fe6e8..2b331e0 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005, 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
@@ -21,7 +21,7 @@ required='libtoolize g++'
cat > configure.in << 'END'
AC_INIT(x, 0, x)
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([subdir-objects])
AC_PROG_CXX
AM_PROG_LIBTOOL
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index d0f83f3..b324568 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 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
@@ -29,7 +30,7 @@ AC_OUTPUT(Makefile)
END
cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = no-dependencies
bin_PROGRAMS = foo bar
foo_CFLAGS = -DFOO
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-261-gf54a09c,
Ralf Wildenhues <=