[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-2110
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2110-g2e343fc |
|
Date: |
Wed, 28 Mar 2012 20:43:00 +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=2e343fc7c69cee628a83759edc33f336eedfa1d0
The branch, master has been updated
via 2e343fc7c69cee628a83759edc33f336eedfa1d0 (commit)
via 3856a9405a7c76348b4e5a23a223ca7f7e4a8735 (commit)
via e343227a1004122bb3f4b54ed06d00a6927cf7c0 (commit)
from 5a4a72a6eb2678f226d3bdc66146174a1cf87a39 (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 2e343fc7c69cee628a83759edc33f336eedfa1d0
Author: Stefano Lattarini <address@hidden>
Date: Wed Mar 28 15:36:30 2012 +0200
news: sync with branch-1.11, fix mis-merges
Signed-off-by: Stefano Lattarini <address@hidden>
commit 3856a9405a7c76348b4e5a23a223ca7f7e4a8735
Author: Stefano Lattarini <address@hidden>
Date: Wed Mar 28 14:31:36 2012 +0200
acinstall: remove, it has never been really used
Accordingly to the git history (see for example the 'README-alpha'
in commit 'Release-1-1e-39-g9beb4ec' of 06-10-1996), the 'acinstall'
script should have been used to install m4 files for aclocal. The
comments in this script report that "... A script is needed to do
this because we want to do serial-number checking; newer versions
of macro files should always be preferred".
But the 'acinstall' script has never been really used: for example,
the entry "actually use acinstall program" was removed (unfixed)
from the TODO file in commit 'Release-1-1k-12-g1201405' of
08-12-1996, and the only citation of 'acinstall' in the manual was
removed in commit 'Release-1-1l-37-g128c3d7' of 19-03-1997, and
never added back. In addition, the last non-trivial edit to the
script (that is, besides updates to the copyright notice) dates
back to 1996.
More importantly, now that aclocal supports the ACLOCAL_PATH
environment variable, installing m4 files directly in the
system-wide acdir is discouraged, and better left only to
distros' package managers (which already have their own way to
do so, with which third-party build systems should not directly
meddle).
So we just remove the 'acinstall' script.
* lib/acinstall: Remove.
* lib/Makefile.am (dist_script_DATA): Update.
Signed-off-by: Stefano Lattarini <address@hidden>
commit e343227a1004122bb3f4b54ed06d00a6927cf7c0
Author: Stefano Lattarini <address@hidden>
Date: Wed Mar 28 13:15:52 2012 +0200
maint: reorganize the source tree and make it less cluttered
* TODO: Move ...
* old/TODO: ... here. This is done because this file is quite
outdated, and today TODO and wishlist items are better handled
though the debbugs tracker.
* ChangeLog.00: Move ...
* old/ChangeLog.00: ... here.
* ChangeLog.01: Move ...
* old/ChangeLog.01: ... here.
* ChangeLog.02: Move ...
* old/ChangeLog.02: ... here.
* ChangeLog.03: Move ...
* old/ChangeLog.03: ... here.
* ChangeLog.04: Move ...
* old/ChangeLog.04: ... here.
* ChangeLog.09: Move ...
* old/ChangeLog.09: ... here.
* ChangeLog.11: Move ...
* old/ChangeLog.11: ... here.
* ChangeLog.96: Move ...
* old/ChangeLog.96: ... here.
* ChangeLog.98: Move ...
* old/ChangeLog.98: ... here.
* tests/ChangeLog-old: Move ...
* old/ChangeLog-tests: .. here.
* tests/Makefile.am (EXTRA_DIST): Adjust.
* Makefile.am (EXTRA_DIST): Likewise.
* .autom4te.cfg: New file, instructing the autotools to place the
autom4te cache directory in '.autom4te.cache' rather than in
'autom4te.cache'.
* .gitignore: Adjust.
* Makefile.am (maintainer-clean-local): Remove the '.autom4te.cache'
directory.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
.autom4te.cfg | 5 +
.gitignore | 2 +-
Makefile.am | 29 +++--
NEWS | 178 ++++++++++++++++------------
lib/Makefile.am | 1 -
lib/acinstall | 50 --------
tests/ChangeLog-old => old/ChangeLog-tests | 0
ChangeLog.00 => old/ChangeLog.00 | 0
ChangeLog.01 => old/ChangeLog.01 | 0
ChangeLog.02 => old/ChangeLog.02 | 0
ChangeLog.03 => old/ChangeLog.03 | 0
ChangeLog.04 => old/ChangeLog.04 | 0
ChangeLog.09 => old/ChangeLog.09 | 0
ChangeLog.11 => old/ChangeLog.11 | 0
ChangeLog.96 => old/ChangeLog.96 | 0
ChangeLog.98 => old/ChangeLog.98 | 0
TODO => old/TODO | 0
tests/Makefile.am | 2 +-
18 files changed, 127 insertions(+), 140 deletions(-)
create mode 100644 .autom4te.cfg
delete mode 100755 lib/acinstall
rename tests/ChangeLog-old => old/ChangeLog-tests (100%)
rename ChangeLog.00 => old/ChangeLog.00 (100%)
rename ChangeLog.01 => old/ChangeLog.01 (100%)
rename ChangeLog.02 => old/ChangeLog.02 (100%)
rename ChangeLog.03 => old/ChangeLog.03 (100%)
rename ChangeLog.04 => old/ChangeLog.04 (100%)
rename ChangeLog.09 => old/ChangeLog.09 (100%)
rename ChangeLog.11 => old/ChangeLog.11 (100%)
rename ChangeLog.96 => old/ChangeLog.96 (100%)
rename ChangeLog.98 => old/ChangeLog.98 (100%)
rename TODO => old/TODO (100%)
diff --git a/.autom4te.cfg b/.autom4te.cfg
new file mode 100644
index 0000000..787905a
--- /dev/null
+++ b/.autom4te.cfg
@@ -0,0 +1,5 @@
+## autom4te.cfg for the Automake package.
+##
+begin-language: "Autoconf-without-aclocal-m4"
+args: --cache=.autom4te.cache
+end-language: "Autoconf-without-aclocal-m4"
diff --git a/.gitignore b/.gitignore
index 6ee3708..fd0c05b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ Makefile
/ChangeLog
/aclocal.m4
/configure
-/autom4te.cache
+/.autom4te.cache
/config.cache
/config.log
/config.status
diff --git a/Makefile.am b/Makefile.am
index a06cd8d..985e7da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,21 +31,23 @@ AUTOMAKESOURCES = automake.in aclocal.in
TAGS_FILES = $(AUTOMAKESOURCES)
EXTRA_DIST = \
+ $(AUTOMAKESOURCES) \
+ bootstrap \
GNUmakefile \
syntax-checks.mk \
HACKING \
- ChangeLog.96 \
- ChangeLog.98 \
- ChangeLog.00 \
- ChangeLog.01 \
- ChangeLog.02 \
- ChangeLog.03 \
- ChangeLog.04 \
- ChangeLog.09 \
- ChangeLog.11 \
- bootstrap \
$(gitlog_to_changelog_fixes) \
- $(AUTOMAKESOURCES)
+ old/ChangeLog-tests \
+ old/ChangeLog.96 \
+ old/ChangeLog.98 \
+ old/ChangeLog.00 \
+ old/ChangeLog.01 \
+ old/ChangeLog.02 \
+ old/ChangeLog.03 \
+ old/ChangeLog.04 \
+ old/ChangeLog.09 \
+ old/ChangeLog.11 \
+ old/TODO
## Make versioned links. We only run the transform on the root name;
## then we make a versioned link with the transformed base name. This
@@ -107,6 +109,11 @@ recheck:
$(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
.PHONY: recheck
+# We don't use the default name for the autom4te cache directory,
+# so we need this.
+maintainer-clean-local:
+ rm -rf .autom4te.cache
+
################################################################
##
## Everything past here is useful to the maintainer, but probably not
diff --git a/NEWS b/NEWS
index 2f52ff7..0a38d1d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+New in 1.11a:
+
* WARNING: Future backward-incompatibilities!
- Starting from the next major Automake version (1.13), the parallel
@@ -46,10 +48,11 @@
search path are looked up is probably going to be changed in the
next Automake release (1.13).
-New in 1.11a:
-
* Obsolete features removed:
+ - The never documented nor truly used script 'acinstall' has been
+ removed.
+
- Support for automatic de-ANSI-fication has been removed.
- The support for the "obscure" multilib feature has been removed
@@ -196,25 +199,10 @@ New in 1.11a:
avoid time stamp issues with makefile rules rerunning autotools
programs.
- - For programs and libraries, automake now detect EXTRA_foo_DEPENDENCIES
- and adds them to the normal list of dependencies, but without
- overwriting the foo_DEPENDENCIES variable, which is normally computed
- by automake.
-
- The warnings in the category 'extra-portability' are now enabled by
'-Wall'. In previous versions, one has to use '-Wextra-portability'
to enable them.
- - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
- symbol index) modifiers as well as the "s" action, as the symbol index
- is created unconditionally by Microsoft lib. Also, the "q" (quick)
- action is now a synonym for "r" (replace). Also, the script has been
- ignoring the "v" (verbose) modifier already since Automake 1.11.3.
-
- - When the 'compile' script is used to wrap MSVC, it now accepts an
- optional space between the -I, -L and -l options and their respective
- arguments, for better POSIX compliance.
-
Bugs fixed in 1.11a:
- Various minor bugfixes for recent or long-standing bugs.
@@ -232,11 +220,6 @@ Bugs fixed in 1.11a:
* Long-standing bugs:
- - It is now possible for a foo_SOURCES variable to hold Vala sources
- together with C header files, as well as with sources and headers for
- other supported languages (e.g., C++). Previously, only mixing C and
- Vala sources was supported.
-
- Automake's own build system finally have a real "installcheck" target.
- Files listed with the AC_REQUIRE_AUX_FILE macro in configure.ac are
@@ -263,18 +246,52 @@ Bugs fixed in 1.11a:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.11.3:
+New in 1.11.4:
* WARNING: Future backward-incompatibilities!
- - The obsolescent AM_WITH_REGEX macro has been deprecated, since the
- GNU rx library has been decommissioned.
+ - The support for the "obscure" multilib feature has been deprecated,
+ and will be moved out of the automake core in the next major Automake
+ release (1.12).
+
+ - The support for ".log -> .html" conversion and the check-html and
+ recheck-html targets will be removed in the next major Automake
+ release (1.12).
+
+ - The obsolescent AM_WITH_REGEX macro has been deprecated (since the
+ GNU rx library has been decommissioned), and will be removed in the
+ next major Automake release (1.12).
- The `lzma' compression format for distribution archives has been
- deprecated in favor of `xz' and `lzip'.
+ deprecated in favor of `xz' and `lzip', and will be removed in the
+ next major Automake release (1.12).
+
+ - The `--acdir' option of aclocal is deprecated, and will probably be
+ removed in the next major Automake release (1.12).
+
+ - The exact order in which the directories in the aclocal macro
+ search path are looked up is probably going to be changed in the
+ next Automake release (1.12).
+
+ - The Automake support for automatic de-ANSI-fication will be removed
+ in the next major Automake release (1.12).
+
+ - Starting from the next Automake release (1.12), warnings in the
+ `extra-portability' category will be enabled by `-Wall' (right now,
+ one has to use `-Wextra-portability' explicitly).
* Miscellaneous changes:
+ - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
+ symbol index) modifiers as well as the "s" action, as the symbol index
+ is created unconditionally by Microsoft lib. Also, the "q" (quick)
+ action is now a synonym for "r" (replace). Also, the script has been
+ ignoring the "v" (verbose) modifier already since Automake 1.11.3.
+
+ - When the 'compile' script is used to wrap MSVC, it now accepts an
+ optional space between the -I, -L and -l options and their respective
+ arguments, for better POSIX compliance.
+
- There is an initial, experimental support for automatic dependency
tracking with tcc (the Tiny C Compiler). Its associated depmode is
currently recognized as "icc" (but this and other details are likely
@@ -283,6 +300,46 @@ New in 1.11.3:
- Automatic dependency tracking now works also with the IBM XL C/C++
compilers, thanks to the new new depmode 'xlc'.
+Bugs fixed in 1.11.4:
+
+* Bugs introduced by 1.11.2:
+
+ - A definition of 'noinst_PYTHON' before 'python_PYTHON' (or similar)
+ don't cause spurious failures upon "make install" anymore.
+
+ - The user can now instruct the 'uninstall-info' rule not to update
+ the '${infodir}/dir' file by exporting the environment variable
+ 'AM_UPDATE_INFO_DIR' to the value "no". This is done for consistency
+ with how the 'install-info' rule operates since automake 1.11.2.
+
+* Long-standing bugs:
+
+ - It is now possible for a foo_SOURCES variable to hold Vala sources
+ together with C header files, as well as with sources and headers for
+ other supported languages (e.g., C++). Previously, only mixing C and
+ Vala sources was supported.
+
+ - If "aclocal --install" is used, and the first directory specified with
+ '-I' is non-existent, aclocal will now create it before trying to copy
+ files in it.
+
+ - An empty declaration of a "foo_PRIMARY" don't cause anymore the
+ generated install rules to create an empty $(foodir) directory;
+ for example, if Makefile.am contains something like:
+
+ pkglibexec_SCRIPTS =
+ if FALSE
+ pkglibexec_SCRIPTS += bar.sh
+ endif
+
+ the $(pkglibexec) directory will not be created upon "make install".
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.11.3:
+
+* Miscellaneous changes:
+
- Automake's own build system is more silent by default, making use of
the 'silent-rules' option.
@@ -310,8 +367,22 @@ New in 1.11.3:
- The last relics of Python 1.5 support have been removed from the
AM_PATH_PYTHON macro.
+ - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
+ and adds them to the normal list of dependencies, but without
+ overwriting the foo_DEPENDENCIES variable, which is normally computed
+ by automake.
+
Bugs fixed in 1.11.3:
+* Bugs introduced by 1.11.2:
+
+ - Automake now correctly recognizes the prefix/primary combination
+ `pkglibexec_SCRIPTS' as valid.
+
+ - The parallel-tests harness doesn't trip anymore on sed implementations
+ with stricter limits on the length of input lines (problem seen at
+ least on Solaris 8).
+
* Long-standing bugs:
- The "deleted header file problem" for *.am files is avoided by stub
@@ -344,7 +415,8 @@ New in 1.11.2:
* Miscellaneous changes:
- The Automake support for automatic de-ANSI-fication has been
- deprecated.
+ deprecated. It will probably be removed in the next major Automake
+ release (1.12).
- The `lzma' compression scheme and associated automake option `dist-lzma'
is obsoleted by `xz' and `dist-xz' due to upstream changes.
@@ -379,36 +451,11 @@ New in 1.11.2:
file generated by automake-provided rules by defining the special make
variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.
- - The `install-info' and `uninstall-info' rules can now be instructed
- not to create/update the `${infodir}/dir' file, by exporting the new
- environment variable `AM_UPDATE_INFO_DIR' to the value "no".
+ - The `install-info' rule can now be instructed not to create/update
+ the `${infodir}/dir' file, by exporting the new environment variable
+ `AM_UPDATE_INFO_DIR' to the value "no".
Bugs fixed in 1.11.2:
- - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
- and adds them to the normal list of dependencies, but without
- overwriting the foo_DEPENDENCIES variable, which is normally computed
- by automake.
-
- - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
- symbol index) modifiers as well as the "s" action, as the symbol index
- is created unconditionally by Microsoft lib. Also, the "q" (quick)
- action is now a synonym for "r" (replace). Also, the script has been
- ignoring the "v" (verbose) modifier already since Automake 1.11.3.
-
- - When the 'compile' script is used to wrap MSVC, it now accepts an
- optional space between the -I, -L and -l options and their respective
- arguments, for better POSIX compliance.
-
- - If "aclocal --install" is used, and the first directory specified with
- '-I' is non-existent, aclocal will now create it before trying to copy
- files in it.
-
-Bugs fixed in 1.11.0a:
-
-* Bugs introduced by 1.11.2:
-
- - Automake now correctly recognizes the prefix/primary combination
- `pkglibexec_SCRIPTS' as valid.
* Bugs introduced by 1.11:
@@ -438,27 +485,6 @@ Bugs fixed in 1.11.0a:
- The order of Yacc and Lex flags is fixed to be consistent with other
languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
$(LFLAGS), so that the user variables override the developer variables.
- - An empty declaration of a "foo_PRIMARY" don't cause anymore the
- generated install rules to create an empty $(foodir) directory;
- for example, if Makefile.am contains something like:
-
- pkglibexec_SCRIPTS =
- if FALSE
- pkglibexec_SCRIPTS += bar.sh
- endif
-
- the $(pkglibexec) directory will not be created upon "make install".
-
- - It is now possible for a foo_SOURCES variable to hold Vala sources
- together with C header files, as well as with sources and headers for
- other supported languages (e.g., C++). Previously, only mixing C and
- Vala sources was supported.
-
- - Vala support now works better in VPATH setups.
-
- - The "deleted header file problem" for *.am files is avoided by stub
- rules. This allows `make' to trigger a rerun of `automake' also if
- some previously needed `.am' file has been removed.
- "make distcheck" now correctly complains also when "make uninstall"
leaves one and only one file installed in $(prefix).
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fb80351..f56db26 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,7 +36,6 @@ dist_script_DATA = \
mkinstalldirs \
elisp-comp \
ylwrap \
- acinstall \
depcomp \
compile \
py-compile \
diff --git a/lib/acinstall b/lib/acinstall
deleted file mode 100755
index 20bdc3a..0000000
--- a/lib/acinstall
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-
-# Install an aclocal-style M4 file. A script is needed to do this
-# because we want to do serial-number checking; newer versions of
-# macro files should always be preferred.
-
-# Usage:
-# acinstall file directory installprogram [install-args]...
-
-# Copyright 1996-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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-file="$1"
-dir="$2"
-shift
-shift
-
-localserial=`grep '^# serial ' $file | sed -e 's/^# serial
\([0-9][0-9]*\).*$/\1/; q'`
-if test -z "$localserial"; then
- echo "acinstall: no serial number in $file" 1>&2
- exit 1
-fi
-
-# Maybe if the installed file has no serial number we should just
-# assume it is ancient.
-instserial=`grep '^# serial ' $dir/$file | sed -e 's/^# serial
\([0-9][0-9]*\).*$/\1/; q'`
-if test -z "$instserial"; then
- echo "acinstall: no serial number in $dir/$file" 1>&2
- exit 1
-fi
-
-if test $localserial -lt $instserial; then
- # Installed file is newer.
- exit 0
-fi
-
-# Install the file.
-$* $file $dir/$file
diff --git a/tests/ChangeLog-old b/old/ChangeLog-tests
similarity index 100%
rename from tests/ChangeLog-old
rename to old/ChangeLog-tests
diff --git a/ChangeLog.00 b/old/ChangeLog.00
similarity index 100%
rename from ChangeLog.00
rename to old/ChangeLog.00
diff --git a/ChangeLog.01 b/old/ChangeLog.01
similarity index 100%
rename from ChangeLog.01
rename to old/ChangeLog.01
diff --git a/ChangeLog.02 b/old/ChangeLog.02
similarity index 100%
rename from ChangeLog.02
rename to old/ChangeLog.02
diff --git a/ChangeLog.03 b/old/ChangeLog.03
similarity index 100%
rename from ChangeLog.03
rename to old/ChangeLog.03
diff --git a/ChangeLog.04 b/old/ChangeLog.04
similarity index 100%
rename from ChangeLog.04
rename to old/ChangeLog.04
diff --git a/ChangeLog.09 b/old/ChangeLog.09
similarity index 100%
rename from ChangeLog.09
rename to old/ChangeLog.09
diff --git a/ChangeLog.11 b/old/ChangeLog.11
similarity index 100%
rename from ChangeLog.11
rename to old/ChangeLog.11
diff --git a/ChangeLog.96 b/old/ChangeLog.96
similarity index 100%
rename from ChangeLog.96
rename to old/ChangeLog.96
diff --git a/ChangeLog.98 b/old/ChangeLog.98
similarity index 100%
rename from ChangeLog.98
rename to old/ChangeLog.98
diff --git a/TODO b/old/TODO
similarity index 100%
rename from TODO
rename to old/TODO
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8901155..864bd24 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,7 @@ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL)
$(top_srcdir)/lib/tap-driver.sh
AM_TAP_LOG_DRIVER_FLAGS = --merge
-EXTRA_DIST = ax/is ChangeLog-old
+EXTRA_DIST = ax/is
TESTS = ## Will be updated later.
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2110-g2e343fc,
Stefano Lattarini <=