[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1999-g0b6a4ae |
|
Date: |
Thu, 16 Feb 2012 22:59:35 +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=0b6a4ae8c5631a2c5886c962b0759269591c113f
The branch, ng/master has been updated
via 0b6a4ae8c5631a2c5886c962b0759269591c113f (commit)
via cb307f229e940e32e85bd517adaa659673bbced2 (commit)
via 89c7592ac38d57ac5849f38558ebda5c4e556a4b (commit)
via 9fc8baccf523a3877a84c065c6c3f2599e0d2147 (commit)
via 85b70d1591f408459996d721eabfe94d8a7bfcb4 (commit)
via 9cdeabc9227df59f75b036be81aa766ed77a8b8a (commit)
via ea441902e8f6e53f548e7df779d3cd71400929ec (commit)
via 86e9e0e331e5008ab5ca9db77d74c542042dcfe8 (commit)
via 0699a84a6f7a085acb76446caa81ce3133dedaf2 (commit)
via 3614a17db7efbc5ca7929ec66dfe278e94930b68 (commit)
via f76cb63c8c775daa81ecad00b0a3ac6019fbebfe (commit)
from 0e035304b3cac2e3087ee08ed2b21ce8dcb1ab85 (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 0b6a4ae8c5631a2c5886c962b0759269591c113f
Author: Stefano Lattarini <address@hidden>
Date: Thu Feb 16 23:58:21 2012 +0100
[ng] readme: fix grammaros and typos
Report by Eric Blake.
commit cb307f229e940e32e85bd517adaa659673bbced2
Author: Stefano Lattarini <address@hidden>
Date: Thu Feb 16 23:33:44 2012 +0100
[ng] yacc: fix botch-up in latest merge
* lib/am/yacc.am: Fix rules badly botched by the recent huge
merge 'v1.11-1987-gf85330b'.
commit 89c7592ac38d57ac5849f38558ebda5c4e556a4b
Author: Stefano Lattarini <address@hidden>
Date: Thu Feb 16 22:08:12 2012 +0100
[ng] maint: use name "Automake-NG" in more places, bump version
It's time to start renaming this project for good, if we want to
avoid nasty confusions with mainstream Automake. But renaming also
the 'automake' script to 'automake-ng' could cause gratuitous
incompatibilities and unexpected errors, so we prefer to instead
bump the version from '1.11a' to '2.0a'.
The renaming "Automake" -> "Automake-NG" is mostly for README files
and some comments. Doing that for the documentation would be
trickier, and might cause extra spurious conflicts when we merge
'master' into 'ng/master', so we leave that move for a later time.
* AUTHORS, README, contrib/README, tests/README, doc/amhello/README:
Update comments, and, where necessary, the mailing list and bug
reporting address.
* doc/Makefile.am, GNUmakefile, syntax-checks.mk, m4/init.m4,
m4/strip.m4, m4/substnot.m4: Update a few comments.
* configure.ac (AC_INIT): Update package name and bug reporting
address. Reset Package version to "2.0a".
(AM_INIT_AUTOMAKE): Remove minimal required version; we expect
to be bootstrapped anyway.
Minor updates to comments and messages.
* lib/ar-lib: Update the "this file is maintained in Automake" line
to read "Automake-NG" instead. Also, update the address where to
send patches to (to <address@hidden>), but, at least for the
moment, *not* the bug reporting address.
* lib/compile: Likewise.
* lib/elisp-comp: Likewise.
* lib/mdate-sh: Likewise.
* lib/mkinstalldirs: Likewise.
* lib/py-compile: Likewise.
* lib/tap-driver.pl: Likewise.
* lib/tap-driver.sh: Likewise.
* lib/test-driver: Likewise.
commit 9fc8baccf523a3877a84c065c6c3f2599e0d2147
Merge: 9cdeabc 85b70d1
Author: Stefano Lattarini <address@hidden>
Date: Thu Feb 16 21:59:46 2012 +0100
Merge branch 'master' into ng/master
* master:
readme: update and renew
depcomp tests: fix up today's botched commit
build: clearer diagnostic if "make" is invoked before "./configure"
depcomp tests: put TAP plan in generated tests
update-copyright: don't touch COPYING and INSTALL
maintcheck: whitelist some false positives
+ Extra diffs:
* syntax-checks.mk: Throw away changes to the obsolete check
'sc_tests_overriding_macros_on_cmdline'.
commit 9cdeabc9227df59f75b036be81aa766ed77a8b8a
Author: Stefano Lattarini <address@hidden>
Date: Thu Feb 16 20:59:27 2012 +0100
[ng] maint: run "make update-copyright" again
We had run this on 'master' recently, but we need to re-run
it on 'ng/master' as well, to update the copyright lines of
files present only in 'ng/master'. Luckily, the resulting
change boil down to an update of ...
* tests/gmake-vars.test: ... just this file.
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 2 +-
COPYING | 2 +-
GNUmakefile | 15 ++++++++--
INSTALL | 3 +-
Makefile.am | 2 +-
README | 71 ++++++++++++++++++----------------------------
configure.ac | 16 +++++-----
contrib/README | 14 ++++----
doc/Makefile.am | 2 -
doc/amhello/README | 3 +-
lib/am/yacc.am | 12 +++++--
lib/ar-lib | 4 +-
lib/compile | 4 +-
lib/elisp-comp | 4 +-
lib/mdate-sh | 4 +-
lib/mkinstalldirs | 4 +-
lib/py-compile | 4 +-
lib/tap-driver.pl | 4 +-
lib/tap-driver.sh | 4 +-
lib/test-driver | 4 +-
lib/ylwrap | 4 +-
m4/amversion.m4 | 6 ++--
m4/init.m4 | 6 ++--
m4/strip.m4 | 2 +-
m4/substnot.m4 | 4 +-
syntax-checks.mk | 6 ++--
tests/README | 57 +++++++++++++++++++-----------------
tests/depcomp.sh | 30 ++++++++-----------
tests/gen-testsuite-part | 5 ++-
tests/gmake-vars.test | 2 +-
30 files changed, 148 insertions(+), 152 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 2690ca6..7b11c8f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-Authors of GNU Automake.
+Authors of GNU Automake-NG.
David Mackenzie
First version of most ".am" files.
diff --git a/COPYING b/COPYING
index a9a3ea0..d511905 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989-2012 Free Software Foundation, Inc.,
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/GNUmakefile b/GNUmakefile
index 134e743..2363ea8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# Maintainer makefile for Automake. Requires GNU make.
+# Maintainer makefile for Automake-NG.
# Copyright (C) 2012 Free Software Foundation, Inc.
#
@@ -15,5 +15,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-include ./Makefile
-include $(srcdir)/syntax-checks.mk
+# If the user runs GNU make but has not yet run ./configure,
+# give them an helpful diagnostic instead of a cryptic error.
+am--Makefile := $(wildcard Makefile)
+ifeq ($(am--Makefile),)
+ $(warning There seems to be no Makefile in this directory.)
+ $(warning You must run ./configure before running 'make'.)
+ $(error Fatal Error)
+else
+ include ./Makefile
+ include $(srcdir)/syntax-checks.mk
+endif
diff --git a/INSTALL b/INSTALL
index 414d0e5..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994-2012 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/Makefile.am b/Makefile.am
index 44d73c2..2befc91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -379,6 +379,6 @@ update-copyright:
$(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \
| sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
$(GIT) ls-files \
- | grep -Ev '/(COPYING|INSTALL)' \
+ | grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \
| grep -Ev "^($$excluded_re)$$" \
| $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/README b/README
index 3c46c77..5511283 100644
--- a/README
+++ b/README
@@ -1,8 +1,10 @@
============================ WARNING! =====================================
-== This is *not* Automake, but rather "Automake-NG": an experimental, ==
-== non-hostile fork of automake; Automake-NG mostly differs from stock ==
-== Automake for the fact that its generated makefiles will only target ==
-== GNU make rather than portable make. ==
+== ==
+== This is *not* mainstream Automake, but rather "Automake-NG": an ==
+== experimental, non-hostile fork of it. Automake-NG mostly differs ==
+== from mainstream Automake in that its generated makefiles only ==
+== target GNU make rather than portable make. ==
+== ==
===========================================================================
Reference to the thread kicking off this project:
@@ -92,52 +94,35 @@ in "it hasn't taken place on any list, neither public nor
non-public"):
===========================================================================
-This is Automake, a Makefile generator. It was inspired by the 4.4BSD
-make and include files, but it only targets GNU make, and it aims to
-conform to the GNU Coding Standards for Makefile variables and targets.
+This is Automake-NG, a Makefile generator. It targets GNU make, and aims
+to conform to the GNU Coding Standards for Makefile variables and targets.
-Automake is a Perl script. The input files are called Makefile.am.
+See the INSTALL file for detailed information about how to configure
+and install Automake-NG.
+
+Automake-NG is a Perl script. The input files are called Makefile.am.
The output files are called Makefile.in; they are intended for use
-with Autoconf. Automake requires certain things to be done in your
+with Autoconf. Automake-NG requires certain things to be done in your
configure.ac.
-Variable assignment lines in Makefile.am pull in defaults from various
-little *.am files.
-
-To use Automake, replace your Makefile.in files with Makefile.am
-files. Read the documentation to see what to do.
-
-This package also includes the "aclocal" program. aclocal is a
-program to generate an `aclocal.m4' based on the contents of
-`configure.ac'. It is useful as an extensible, maintainable mechanism
-for augmenting autoconf. It is intended that other package authors
-will write m4 macros which can be automatically used by aclocal.
-
-Automake has a test suite. Use
-
- make check
-
-to run it. For more information, see the file tests/README.
-
-Automake has a page on the web. See:
-
- http://www.gnu.org/software/automake/
-
-Automake also has three mailing lists:
-
- * address@hidden
- For general discussions of Automake and its interactions with other
- configuration/portability tools like Autoconf or Libtool.
+Automake-NG comes with extensive documentation; please refer to it for
+more details about its purpose, features, and usage patterns.
- * address@hidden
- Where to send bug reports and feature requests.
+This package also includes the "aclocal" program, whose purpose is
+to generate an 'aclocal.m4' based on the contents of 'configure.ac'.
+It is useful as an extensible, maintainable mechanism for augmenting
+autoconf. It is intended that other package authors will write m4
+macros which can be automatically used by aclocal. The documentation
+for aclocal is currently found in the Automake-NG manual.
- * address@hidden
- Where to send patches, and discuss the automake development process
- and the design of new features.
+Automake-NG has a test suite. Use "make check" to run it. For more
+information, see the file tests/README.
-To obtain more information about these list, or to subscribe to them,
-refer to <http://www.gnu.org/software/automake/#mailinglists>
+Automake-NG still doesn't have a page on the web. But it has one
+mailing list, <address@hidden>, that can be used for general
+discussions and to send bug reports, feature requests, and patches.
+To obtain more information about this list, or to subscribe to it,
+refer to <http://lists.gnu.org/mailman/listinfo/automake-ng/>
New releases are announced to address@hidden If you want to
be informed, subscribe to that list by following the instructions at
diff --git a/configure.ac b/configure.ac
index 1b8ebb4..7c11411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.68])
-AC_INIT([GNU Automake], [1.11a], address@hidden)
+AC_INIT([GNU Automake-NG], [2.0a], address@hidden)
AC_CONFIG_SRCDIR([automake.in])
AC_CONFIG_AUX_DIR([lib])
@@ -39,7 +39,7 @@ AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDATE-autoupdate}"])
dnl We call AC_PROG_CC in an unusual way, and only for use in our
dnl testsuite, so also use `no-dependencies' and `no-define' among
dnl the automake options to avoid bloating and potential problems.
-AM_INIT_AUTOMAKE([1.10a dist-xz filename-length-max=99 color-tests
+AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests
parallel-tests silent-rules no-define no-dependencies])
# The API version is the base version. We must guarantee
@@ -73,7 +73,7 @@ $PERL -e 'require 5.006;' || {
AC_MSG_ERROR(
[perl 5.6 or better is required; perl 5.8.2 or better
is recommended. If you have several perl versions
-installed, select the one Automake should use using
+installed, select the one Automake-NG should use using
./configure PERL=/path/to/perl])
}
@@ -231,7 +231,7 @@ AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
dnl We don't want to abort our configuration script if no C compiler is
dnl available, as such a compiler is only required to run part of the
-dnl testsuite, not to build or install Automake. Ditto for C++, Fortran
+dnl testsuite, not to build or install Automake-NG. Ditto for C++, Fortran
dnl and Fortran 77 compilers. Unfortunately, autoconf does not offer an
dnl easy way to obtain this behaviour, so we'll need a few hacks.
@@ -350,8 +350,8 @@
AC_CONFIG_FILES([tests/automake-${APIVERSION}:tests/automake.in],
AC_OUTPUT
-# Inform the user if this version of automake is a beta release or
-# a development snapshot.
+# Inform the user if this version of Automake-ng is a beta release
+# or a development snapshot.
# According to HACKING, the version of a development snapshot should
# end with an "odd" letter (a, c, ...), the version of a test release
# should end wit an "even" letter (b, d, ...).
@@ -366,11 +366,11 @@ am_release_type=`AS_ECHO(["$PACKAGE_VERSION"]) | LC_ALL=C
awk ["
test "$am_release_type" = stable || cat <<EOF
-WARNING: You are about to use a $am_release_type of automake.
+WARNING: You are about to use a $am_release_type of Automake-NG.
WARNING: It might easily suffer from new bugs or regressions.
WARNING: You are strongly advised not to use it in production code.
-Please report bugs, problems and feedback to <address@hidden>.
+Please report bugs, problems and feedback to <address@hidden>.
EOF
AS_EXIT([0])
diff --git a/contrib/README b/contrib/README
index a4d7eeb..0202fc7 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,16 +1,16 @@
-This is the 'contrib' directory of the GNU Automake distribution.
+This is the 'contrib' directory of the GNU Automake-NG distribution.
-Here you'll find additions to the Automake base distribution, in form of
-makefile fragments, m4 macros, scripts, documentation, et cetera. Such
+Here you'll find additions to the Automake-NG base distribution, in form
+of makefile fragments, m4 macros, scripts, documentation, et cetera. Such
addition that might be useful for a significant percentage of its general
audience, but (for one reason or another) are not deemed appropriate for
-inclusion into the Automake core.
+inclusion into the Automake-NG core.
There are several reasons for which a feature can be kept in contrib:
1. The long-term usefulness of the feature is debatable and uncertain;
- on-field and real-word testing are necessary to prove or disprove
- its usefulness, before the feature can be committed into the Automake
+ on-field and real-word testing are necessary to prove or disprove its
+ usefulness, before the feature can be committed into the Automake-NG
core (as doing so too early would later force us to continue the
support for backward-compatibility, even if the features proves
flawed or fails to attract widespread use).
@@ -21,6 +21,6 @@ There are several reasons for which a feature can be kept in
contrib:
3. The feature was an historical one, mostly obsoleted but still used
"here and there" in the wild; so we want to to deprecate it and
- remove it from the Automake core, but cannot remove it altogether,
+ remove it from the Automake-NG core, but cannot remove it altogether,
for the sake of those still-existing usage. So it gets moved in
contrib.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4b90fd4..24766db 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to create Makefile.in
-## Makefile for Automake.
-
# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
diff --git a/doc/amhello/README b/doc/amhello/README
index d24723a..4a3daf6 100644
--- a/doc/amhello/README
+++ b/doc/amhello/README
@@ -1,2 +1 @@
-This is a demonstration package for GNU Automake.
-Type `info Automake' to read the Automake manual.
+This is a demonstration package for GNU Automake-NG.
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index e2a5bea..ac784df 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -44,7 +44,11 @@ endif %?FIRST%
?GENERIC?%EXT%%DERIVED-EXT%:
?!GENERIC?%OBJ%: %SOURCE%
?SUBDIROBJ? %SILENT%test -d $(dir $@) || $(MKDIR_P) $(dir $@)
-?GENERIC? %VERBOSE%$(am__skipyacc) \
--?!GENERIC??DIST_SOURCE? %VERBOSE%$(am__skipyacc) \
- $(SHELL) $(YLWRAP) $< y.tab.c %OBJ% y.tab.h %BASE%.h \
- `echo %OBJ% | $(am__yacc_c2h)` y.output %BASE%.output -- %COMPILE%
+ %VERBOSE% \
+?GENERIC? $(am__skipyacc) \
+?!GENERIC??DIST_SOURCE? $(am__skipyacc) \
+ $(SHELL) $(YLWRAP) $< \
+ y.tab.c $@ \
+ y.tab.h `echo %OBJ% | $(am__yacc_c2h)` \
+ y.output %BASE%.output \
+ -- %COMPILE%
diff --git a/lib/ar-lib b/lib/ar-lib
index c698ac5..ee1aa5a 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -25,9 +25,9 @@ scriptversion=2012-01-30.22; # UTC
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
# func_error message
diff --git a/lib/compile b/lib/compile
index e8a13ea..affba17 100755
--- a/lib/compile
+++ b/lib/compile
@@ -24,9 +24,9 @@ scriptversion=2012-01-04.17; # UTC
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
nl='
'
diff --git a/lib/elisp-comp b/lib/elisp-comp
index 7766db4..64aae5a 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -23,9 +23,9 @@ scriptversion=2010-02-06.18; # UTC
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
case $1 in
'')
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 4614441..d35892b 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -24,9 +24,9 @@ scriptversion=2010-08-21.06; # UTC
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index 55d537f..96a7965 100755
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -7,9 +7,9 @@ scriptversion=2009-04-28.21; # UTC
# Created: 1993-05-16
# Public domain.
#
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
nl='
'
diff --git a/lib/py-compile b/lib/py-compile
index 699e28f..87de337 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -23,9 +23,9 @@ scriptversion=2011-06-08.12; # UTC
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
if [ -z "$PYTHON" ]; then
PYTHON=python
diff --git a/lib/tap-driver.pl b/lib/tap-driver.pl
index 7f420af..c15d2b5 100755
--- a/lib/tap-driver.pl
+++ b/lib/tap-driver.pl
@@ -19,9 +19,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
# ---------------------------------- #
# Imports, static data, and setup. #
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 259ca0d..bcc8856 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -19,9 +19,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
scriptversion=2011-12-27.17; # UTC
diff --git a/lib/test-driver b/lib/test-driver
index 2398a06..2544010 100755
--- a/lib/test-driver
+++ b/lib/test-driver
@@ -23,9 +23,9 @@ scriptversion=2011-08-17.14; # UTC
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
# Make unconditional expansion of undefined variables an error. This
# helps a lot in preventing typo-related bugs.
diff --git a/lib/ylwrap b/lib/ylwrap
index 36543da..6465b8e 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -25,9 +25,9 @@ scriptversion=2011-08-25.18; # UTC
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
+# This file is maintained in Automake-NG, please report
# bugs to <address@hidden> or send patches to
-# <address@hidden>.
+# <address@hidden>.
case "$1" in
'')
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index f71d65a..c06ba4c 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -14,10 +14,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11a'
+[am__api_version='2.0a'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11a], [],
+m4_if([$1], [2.0a], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -33,7 +33,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11a])dnl
+[AM_AUTOMAKE_VERSION([2.0a])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/m4/init.m4 b/m4/init.m4
index ec15529..df56444 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,4 +1,4 @@
-# Do all the work for Automake. -*- Autoconf -*-
+# Do all the work for Automake-NG. -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
@@ -19,7 +19,7 @@
# and VERSION should now be passed to AC_INIT and removed from
# the call to AM_INIT_AUTOMAKE.
# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
+# the next Automake-NG release, Autoconf can make the AC_INIT
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
@@ -68,7 +68,7 @@ _AM_IF_OPTION([no-define],,
[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-# Some tools Automake needs.
+# Some tools Automake-NG needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
diff --git a/m4/strip.m4 b/m4/strip.m4
index 7dfeb00..0def192 100644
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -20,7 +20,7 @@ AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
+# tool to use in cross-compilation environments, therefore Automake-NG
# will honor the `STRIP' environment variable to overrule this program.
dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
diff --git a/m4/substnot.m4 b/m4/substnot.m4
index 64d91ff..22a2612 100644
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@ -9,8 +9,8 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
+# Prevent Automake-NG from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake-NG.
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 1b5e08c..113cc84 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -1,4 +1,4 @@
-# Maintainer checks for Automake. Requires GNU make.
+# Maintainer checks for Automake-NG.
# Copyright (C) 2012 Free Software Foundation, Inc.
#
@@ -214,7 +214,7 @@ sc_no_for_variable_in_macro:
sc_mkinstalldirs:
@if grep -n 'mkinstalldirs' $(ams) \
| grep -F -v '$$(mkinstalldirs)' \
- | grep -v '^\./lib/Makefile.am:37: *mkinstalldirs \\$$'; \
+ | grep -v '^\./lib/Makefile.am:[0-9][0-9]*: *mkinstalldirs
\\$$'; \
then \
echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
exit 1; \
@@ -279,7 +279,7 @@ sc_perl_local_no_parens:
exit 1; \
fi
-## Allow only few variables to be localized in Automake.
+## Allow only few variables to be localized in automake.
sc_perl_local:
@if egrep -v '^[ \t]*local \$$[_~]( *=|;)' $(srcdir)/automake.in | \
grep '^[ \t]*local [^*]'; then \
diff --git a/tests/README b/tests/README
index 02b14e3..08d06cf 100644
--- a/tests/README
+++ b/tests/README
@@ -1,4 +1,4 @@
- The Automake test suite
+ The Automake-NG test suite
User interface
@@ -29,9 +29,9 @@ Running the tests
make -k check TESTS="foo.test bar.test"
To run the tests in cross-compilation mode, you should first configure
- the automake source tree to a cross-compilation setup. For example, to
- run with a Linux-to-MinGW cross compiler, you will need something like
- this:
+ the Automake-NG source tree to a cross-compilation setup. For example,
+ to run with a Linux-to-MinGW cross compiler, you will need something
+ like this:
./configure --host i586-mingw32msvc --build i686-pc-linux-gnu
@@ -77,11 +77,12 @@ Getting details from failures
About the tests
---------------
- There are two kinds of tests in the Automake testsuite (both implemented
- as shell scripts). The scripts with the `.test' suffix are "simple"
- tests, their outcome completely determined by their exit status. Those
- with the `.tap' suffix use the TAP protocol. If you want to run a test
- by hand, you can do so directly if it is a simple test:
+ There are two kinds of tests in the Automake-NG testsuite (both
+ implemented as shell scripts). The scripts with the `.test' suffix
+ are "simple" tests, their outcome completely determined by their exit
+ status. Those with the `.tap' suffix use the TAP protocol. If you
+ want to run a test by hand, you can do so directly if it is a simple
+ test:
./nogzip.test
@@ -136,8 +137,8 @@ Reporting failures
------------------
Send verbose output, i.e., the contents of test-suite.log, of failing
- tests to <address@hidden>, along with the usual version numbers
- (which Automake, which Autoconf, which operating system, which make
+ tests to <address@hidden>, along with the usual version numbers
+ (which Automake-NG, which Autoconf, which operating system, which make
version, which shell, etc.)
@@ -181,13 +182,13 @@ Do
set-up of a test scenario, you can use the `framework_fail_' function
instead.
- For tests that use the `parallel-tests' Automake option, set the shell
- variable `am_parallel_tests' to "yes" before including ./defs. For tests
- that are *not* meant to work with the `parallel-tests' Automake option
- (these should be very very few), set the shell variable `am_parallel_tests'
- to "no" before including ./defs.
+ For tests that use the `parallel-tests' Automake-NG option, set the
+ shell variable `am_parallel_tests' to "yes" before including ./defs.
+ For tests that are *not* meant to work with the `parallel-tests'
+ Automake-NG option (these should be very very few), set the shell
+ variable `am_parallel_tests' to "no" before including ./defs.
- Some tests in the Automake testsuite are auto-generated; those tests
+ Some tests in the Automake-NG testsuite are auto-generated; those tests
might have custom extensions, but their basename (that is, with such
extension stripped) is expected to end with "-w" string, optionally
followed by decimal digits. For example, the name of a valid
@@ -236,10 +237,10 @@ Do
Use `$PATH_SEPARATOR', not hard-coded `:', as the separator of
PATH's entries.
- It's more important to make sure that a feature works, than
- make sure that Automake's output looks correct. It might look
- correct and still fail to work. In other words, prefer
- running `make' over grepping `Makefile.in' (or do both).
+ It's more important to make sure that a feature works, than make sure
+ that the output of Automake-NG looks correct. It might look correct
+ and still fail to work. In other words, prefer running `make' over
+ grepping `Makefile.in' (or do both).
If you run $AUTOMAKE or $AUTOCONF several times in the same test
and change `configure.in' by the meantime, do
@@ -253,25 +254,27 @@ Do
`echo $filename | ...`.
Make sure your test script can be used to faithfully check an
- installed version of automake (as with "make installcheck"). For
- example, if you need to copy or grep an automake-provided script,
+ installed version of Automake-ng (as with "make installcheck"). For
+ example, if you need to copy or grep an Automake-ng provided script,
do not assume that they can be found in the `$top_srcdir/lib'
directory, but use `$am_scriptdir' instead. The complete list of
such `$am_..dir' variables can be found in tests/defs-static.in.
Before commit: make sure the test is executable, add the tests to
TESTS in Makefile.am, add it to XFAIL_TESTS in addition if needed,
- write a ChangeLog entry, send the diff to <address@hidden>.
+ write a ChangeLog entry, send the diff to <address@hidden>.
Do not
------
- Do not test an Automake error with `$AUTOMAKE && Exit 1', or in three
- years we'll discover that this test failed for some other bogus reason.
- This happened many times. Better use something like
+ Do not test an Automake-NG error with `$AUTOMAKE && Exit 1', or in
+ three years we'll discover that this test failed for some other bogus
+ reason. This happened many times. Better use something like
+
AUTOMAKE_fails
grep 'expected diagnostic' stderr
+
(Note this doesn't prevent the test from failing for another
reason, but at least it makes sure the original error is still
here.)
diff --git a/tests/depcomp.sh b/tests/depcomp.sh
index d149280..d204058 100755
--- a/tests/depcomp.sh
+++ b/tests/depcomp.sh
@@ -67,8 +67,7 @@
# -------------------------------------------------------------------------
-am_create_testdir=empty
-. ./defs || Exit 1
+# This expects ./defs has already been included has already been included..
ocwd=`pwd` || fatal_ "cannot get current working directory"
longpath=this-is/a-path/which-has/quite-a/definitely/truly/long_long_name
@@ -286,30 +285,25 @@ test -f build-aux/depcomp \
# selected by '--enable-dependency-tracking', we make this threefold check
# only in this later case.
+if test $depmode,$depcomp_with_libtool = auto,yes; then
+ do_all_tests ()
+ {
+ do_test default
+ do_test noshared --disable-shared
+ do_test nostatic --disable-static
+ }
+else
+ do_all_tests () { do_test; }
+fi
+
case $depmode in
auto)
- if test $depcomp_with_libtool = no; then
- plan_ 28
- do_all_tests () { do_test; }
- else
- plan_ 84
- do_all_tests ()
- {
- do_test default
- do_test noshared --disable-shared
- do_test nostatic --disable-static
- }
- fi
displayed_depmode='..*' # At least one character long.
cfg_deptrack=--enable-dependency-tracking ;;
disabled)
- plan_ 28
- do_all_tests () { do_test; }
displayed_depmode=none
cfg_deptrack=--disable-dependency-tracking ;;
*)
- plan_ 28
- do_all_tests () { do_test; }
displayed_depmode="(cached) $depmode"
cfg_deptrack="$cachevar=$depmode"
# Sanity check: ensure the cache variable we force is truly
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index bafb113..ebf28e2 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -346,6 +346,7 @@ foreach my $lt (TRUE, FALSE)
{
foreach my $m (keys %depmodes)
{
+ my $planned = ($lt && $m eq "auto") ? 84 : 28;
my @required =
(
@{$depmodes{$m}},
@@ -353,6 +354,7 @@ foreach my $lt (TRUE, FALSE)
);
my @vars_init =
(
+ "am_create_testdir=empty",
"depmode=$m",
"depcomp_with_libtool=" . ($lt ? "yes" : "no"),
);
@@ -367,7 +369,8 @@ foreach my $lt (TRUE, FALSE)
# Automatically generated test. DO NOT EDIT BY HAND!
@vars_init
required="@required"
- . ./defs-static || exit '99'
+ . ./defs || Exit 1
+ plan_ $planned
. "\$testsrcdir/depcomp.sh"; exit "\$?"
EOF
},
diff --git a/tests/gmake-vars.test b/tests/gmake-vars.test
index 5c52df3..659d1a1 100755
--- a/tests/gmake-vars.test
+++ b/tests/gmake-vars.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11-1999-g0b6a4ae,
Stefano Lattarini <=