[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. ng-0.5a
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. ng-0.5a-172-g5edc5fc |
|
Date: |
Wed, 04 Apr 2012 10:04:38 +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=5edc5fc4b997d2748967a054638ca0190f10be51
The branch, ng/master has been updated
via 5edc5fc4b997d2748967a054638ca0190f10be51 (commit)
via da7bbf1eb5315d2bc6e94cbc2f7a106b214bd645 (commit)
via 97ae26eaa9009e60537dfb18f5f7cd3a412ae7fd (commit)
via 9fe2ba38429cd307900c785d098f0ee273cc4196 (commit)
via 24cd4ca144982b8d378cb15023838e301a409f52 (commit)
via 55c8794d11d2e210aa567306049d2ea34754163b (commit)
via 2a487237c0614d3dd71298c0c31857b32b818198 (commit)
via 1e3b481cfa56e5cccf7c1847bbc5c40a9df029bb (commit)
via ef6a48297a70b763e9c4b141fcce93a8a9c74c1c (commit)
via d714ec513745fe50c03d49c9ab6481ce36d3a27e (commit)
via 2d671e11c8574d86c47211cc1bfe680ec8d91957 (commit)
via 84bf694bcba198d700a3214a0f1be7e24a6c8755 (commit)
via 26a63b3be6f10afce917bcbc93c69aa80b29a919 (commit)
via feeb7f6a910bdf9ede9d0cc6a69040a3eb6d30d8 (commit)
via 2e343fc7c69cee628a83759edc33f336eedfa1d0 (commit)
via 3856a9405a7c76348b4e5a23a223ca7f7e4a8735 (commit)
via e343227a1004122bb3f4b54ed06d00a6927cf7c0 (commit)
via 5a4a72a6eb2678f226d3bdc66146174a1cf87a39 (commit)
from 661c89f60e696fb49b6678541e6816dcb225a378 (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 5edc5fc4b997d2748967a054638ca0190f10be51
Author: Stefano Lattarini <address@hidden>
Date: Wed Apr 4 12:03:33 2012 +0200
[ng] maintcheck: avoid failures due to recent merge
* tests/link_cond.test: Avoid using "make -e".
* tests/vala-mix2.test: Do not require GNU make explicitly.
Signed-off-by: Stefano Lattarini <address@hidden>
commit da7bbf1eb5315d2bc6e94cbc2f7a106b214bd645
Merge: 661c89f 97ae26e
Author: Stefano Lattarini <address@hidden>
Date: Wed Apr 4 11:56:19 2012 +0200
Merge branch 'master' into ng/master
* master:
texinfo: warn about future use of '--tidy'
texinfo: don't clutter the builddir when using modern texi2dvi
hacking: autotools-generated files are not committed anymore
hacking: simplify documentation of bootstrapping process
cosmetics: remove repeated line in comment, fix quoting
cosmetics: remove useless import in automake script
docs: deprecate 'cygnus' mode, help the transition
perl refactor: use modern semantics of 'open'
cosmetics: don't make the generated Config.pm executable
maint: reduce use of recursion in automake build system
news: sync with branch-1.11, fix mis-merges
acinstall: remove, it has never been really used
maint: reorganize the source tree and make it less cluttered
news: we are going to drop 'cygnus' soonish
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
.autom4te.cfg | 5 +
.gitignore | 2 +-
HACKING | 12 +--
Makefile.am | 29 +++--
NEWS | 193 +++++++++++++++++-----------
THANKS | 1 +
automake.in | 4 +-
configure.ac | 2 -
doc/automake.texi | 67 +++++-----
lib/Automake/FileUtils.pm | 33 +-----
lib/Automake/Makefile.am | 67 ----------
lib/Automake/XFile.pm | 13 ++-
lib/Makefile.am | 107 +++++++++++++++-
lib/acinstall | 50 -------
lib/am/Makefile.am | 59 ---------
lib/am/texibuild.am | 14 ++-
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 +-
tests/link_cond.test | 8 +-
tests/list-of-tests.mk | 2 +-
tests/txinfo-no-clutter.test | 102 +++++++++++++++
tests/txinfo18.test | 75 -----------
tests/vala-mix2.test | 2 +-
33 files changed, 415 insertions(+), 434 deletions(-)
create mode 100644 .autom4te.cfg
delete mode 100644 lib/Automake/Makefile.am
delete mode 100755 lib/acinstall
delete mode 100644 lib/am/Makefile.am
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%)
create mode 100755 tests/txinfo-no-clutter.test
delete mode 100755 tests/txinfo18.test
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 7bba195..6e995f1 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/HACKING b/HACKING
index 2e74d9a..29c0e4a 100644
--- a/HACKING
+++ b/HACKING
@@ -100,16 +100,8 @@
tree, so the resulting files (aclocal.m4 and Makefile.in) should
be the same as you would get if you install this version of
automake and use it to generate those files. Be sure to have the
- latest stable version of Autoconf installed. If such version is
- not installed as "autoconf", pass it explicitly (along with the
- accompanying "autom4te") when calling 'bootstrap' and 'configure'.
- For example:
- $ AUTOCONF=autoconf2.68 AUTOM4TE=autom4te2.68 ./bootstrap
- $ ./configure AUTOCONF=autoconf2.68 AUTOM4TE=autom4te2.68
-
-* Dependent files aclocal.m4, configure and Makefile.in in all
- directories should be up to date in the git repository, so that
- the changes in them can be easily noticed and analyzed.
+ latest stable version of Autoconf installed and available early
+ in your PATH.
* The git tree currently carries a number of branches: master for the
current development, and release branches named branch-X.Y. The maint
diff --git a/Makefile.am b/Makefile.am
index 7231698..005512b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,22 +31,24 @@ AUTOMAKESOURCES = automake.in aclocal.in
TAGS_FILES = $(AUTOMAKESOURCES)
EXTRA_DIST = \
+ $(AUTOMAKESOURCES) \
+ bootstrap \
GNUmakefile \
syntax-checks.mk \
HACKING \
NG-NEWS \
- 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
@@ -108,6 +110,11 @@ recheck:
$(am__cd) tests && $(MAKE) $@
.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 fd8f38c..3c0df1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
+New in 1.11a:
+
* WARNING: Future backward-incompatibilities!
+ - Starting from the next major Automake version (1.13), the rules to
+ build pdf, ps and dvi output from Texinfo input will use the '--tidy'
+ option by default. Since such an option was introduced in Texinfo
+ 4.9, this means that Makefiles generated by future Automake versions
+ will require at least that version of Texinfo.
+
- Starting from the next major Automake version (1.13), the parallel
testsuite harness (previously only enabled by the 'parallel-tests'
option) will become the default one; the older serial testsuite
@@ -24,6 +32,10 @@
- All the "old alias" macros in 'm4/obsolete.m4' will be removed in
the next major Automake version (1.13).
+ - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option)
+ will be deprecated in the next minor version of Automake (1.12.1) and
+ removed in the next major version (1.13).
+
- Support for the two- and three-arguments invocation forms of the
AM_INIT_AUTOMAKE macro will be deprecated in the next minor version
of Automake (1.12.1) and removed in the next major version (1.13).
@@ -42,10 +54,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
@@ -174,6 +187,11 @@ New in 1.11a:
- The 'dist' and 'dist-all' targets now can run compressors in parallel.
+ - The rules to create pdf, dvi and ps output from Texinfo files now
+ works better with modern 'texi2dvi' script, by explicitly passing
+ it the '--clean' option to ensure stray auxiliary files are not
+ left to clutter the build directory.
+
- Automake can now generate silenced rules for texinfo outputs.
- Some auxiliary files that are automatically distributed by Automake
@@ -192,25 +210,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.
@@ -228,11 +231,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
@@ -259,18 +257,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
@@ -279,6 +311,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.
@@ -306,8 +378,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
@@ -340,7 +426,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.
@@ -375,36 +462,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:
@@ -434,27 +496,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/THANKS b/THANKS
index bfa94d2..2f91ee7 100644
--- a/THANKS
+++ b/THANKS
@@ -182,6 +182,7 @@ John Ratliff address@hidden
John R. Cary address@hidden
John W. Coomes address@hidden
Jonathan Nieder address@hidden
+Joseph S. Myers address@hidden
Josh MacDonald address@hidden
Joshua Cowan address@hidden
js pendry address@hidden
diff --git a/automake.in b/automake.in
index 5cd9f95..cadb083 100644
--- a/automake.in
+++ b/automake.in
@@ -150,7 +150,6 @@ use Automake::Location;
use Automake::Condition qw/TRUE FALSE/;
use Automake::DisjConditions;
use Automake::Options;
-use Automake::Version;
use Automake::Variable;
use Automake::VarDef;
use Automake::Rule;
@@ -955,8 +954,7 @@ register_language ('name' => 'ppfc',
# passing "$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
# $(CPPFLAGS)" as additional flags to the Fortran 77 compiler, since
# this is how GNU Make does it; see the "GNU Make Manual, Edition 0.51
-# for `make' Version 3.76 Beta" (specifically, from info file
-# for `make' Version 3.76 Beta" (specifically, from info file
+# for 'make' Version 3.76 Beta" (specifically, from info file
# '(make)Catalogue of Rules').
#
# A better approach would be to write an Autoconf test
diff --git a/configure.ac b/configure.ac
index 5224470..7f61645 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,9 +399,7 @@ AC_CONFIG_FILES([
Makefile
contrib/Makefile
doc/Makefile
- lib/Automake/Makefile
lib/Makefile
- lib/am/Makefile
m4/Makefile
tests/Makefile
])
diff --git a/doc/automake.texi b/doc/automake.texi
index 203e235..76aa651 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -115,7 +115,7 @@ section entitled ``GNU Free Documentation License.''
* Conditionals:: Conditionals
* Silencing Make:: Obtain less verbose output from @command{make}
* Gnits:: The effect of @option{--gnu} and
@option{--gnits}
-* Cygnus:: The effect of @option{--cygnus}
+* Cygnus:: The effect of @option{--cygnus} (deprecated,
soon to be removed)
* Not Enough:: When Automake is not Enough
* Distributing:: Distributing the Makefile.in
* API Versioning:: About compatibility between Automake versions
@@ -1964,10 +1964,13 @@ standard is actually published (which may never happen).
@xref{Gnits}, for more information on the precise implications of the
strictness level.
-Automake also has a special ``cygnus'' mode that is similar to
-strictness but handled differently. This mode is useful for packages
-that are put into a ``Cygnus'' style tree (e.g., the GCC tree).
address@hidden, for more information on this mode.
+Automake also has a special (and @emph{today deprecated}) ``cygnus'' mode
+that is similar to strictness but handled differently. This mode is
+useful for packages that are put into a ``Cygnus'' style tree (e.g., older
+versions of the GCC and gdb trees). @xref{Cygnus}, for more information
+on this mode. Please note that this mode is deprecated and @emph{will be
+removed in the future automake versions}; you must avoid its use in new
+packages, and should stop using it in existing packages as well.
@node Uniform
@@ -2610,6 +2613,8 @@ copied. The default is to make a symbolic link.
@opindex --cygnus
Causes the generated @file{Makefile.in}s to follow Cygnus rules, instead
of GNU or Gnits rules. For more information, see @ref{Cygnus}.
+Note that @emph{this mode of operation is deprecated, and will be removed}
+in a future Automake release.
@item -f
@opindex -f
@@ -11005,10 +11010,15 @@ The file @file{THANKS} is required.
@cindex @option{cygnus} strictness
-Some packages, notably GNU GCC and GNU gdb, have a build environment
-originally written at Cygnus Support (subsequently renamed Cygnus
-Solutions, and then later purchased by Red Hat). Packages with this
-ancestry are sometimes referred to as ``Cygnus'' trees.
address@hidden features described in this section are deprecated; you must
+not use any of them in new code, and should remove their use from older
+but still maintained code: they will be withdrawn in a future Automake
+release.}
+
+Some packages, notably GNU GCC and GNU gdb, used to have a build
+environment originally written at Cygnus Support (subsequently renamed
+Cygnus Solutions, and then later purchased by Red Hat). Packages with
+this ancestry are sometimes referred to as ``Cygnus'' trees.
A Cygnus tree has slightly different rules for how a
@file{Makefile.in} is to be constructed. Passing @option{--cygnus} to
@@ -11018,45 +11028,40 @@ comply with Cygnus rules.
Here are the precise effects of @option{--cygnus}:
@itemize @bullet
address@hidden
-Info files are always created in the build directory, and not in the
-source directory.
@item
address@hidden is not required if a Texinfo source file is
-specified. The assumption is that the file will be supplied, but in a
-place that Automake cannot find. This assumption is an artifact of how
-Cygnus packages are typically bundled.
+The @option{foreign} strictness is implied.
@item
address@hidden dist} is not supported, and the rules for it are not
-generated. Cygnus-style trees use their own distribution mechanism.
+The options @option{no-installinfo}, @option{no-dependencies} and
address@hidden are implied (@pxref{Options}).
@item
-Certain tools will be searched for in the build tree as well as in the
-user's @env{PATH}. These tools are @command{runtest}, @command{expect},
address@hidden and @command{texi2dvi}.
+The macro @code{AM_MAINTAINER_MODE} is required.
@item
address@hidden is implied.
+Info files are always created in the build directory, and not in the
+source directory. Packages that don't use the @option{cygnus} option
+can emulate this effect by using the @option{no-installinfo} option
+and listing the generated info files in the @code{CLEANFILES} variable.
@item
-The options @option{no-installinfo} and @option{no-dependencies} are
-implied.
address@hidden is not required if a Texinfo source file is
+specified. The assumption is that the file will be supplied, but in a
+place that Automake cannot find -- it is an artifact of how Cygnus
+packages are typically bundled. This effect can be emulated in
+packages not using the @option{cygnus} option with a proper definition
+of the @code{TEXINFO_TEX} variable (@pxref{Texinfo}).
@item
-The macro @code{AM_MAINTAINER_MODE} is required.
+Certain tools will be searched for in the build tree as well as in the
+user's @env{PATH}. These tools are @command{runtest}, @command{expect},
address@hidden and @command{texi2dvi}.
@item
The @code{check} target doesn't depend on @code{all}.
@end itemize
-GNU maintainers are advised to use @option{gnu} strictness in preference
-to the special Cygnus mode. Some day, perhaps, the differences between
-Cygnus trees and GNU trees will disappear (for instance, as GCC is made
-more standards compliant). At that time the special Cygnus mode will be
-removed.
-
@node Not Enough
@chapter When Automake Isn't Enough
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 17d8a49..fc2347b 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -45,40 +45,13 @@ use Automake::ChannelDefs;
use vars qw (@ISA @EXPORT);
@ISA = qw (Exporter);
address@hidden = qw (&open_quote &contents
address@hidden = qw (&contents
&find_file &mtime
&update_file &up_to_date_p
&xsystem &xsystem_hint &xqx
&dir_has_case_matching_file &reset_dir_cache
&set_dir_cache_file);
-
-=item C<open_quote ($file_name)>
-
-Quote C<$file_name> for open.
-
-=cut
-
-# $FILE_NAME
-# open_quote ($FILE_NAME)
-# -----------------------
-# If the string $S is a well-behaved file name, simply return it.
-# If it starts with white space, prepend './', if it ends with
-# white space, add '\0'. Return the new string.
-sub open_quote($)
-{
- my ($s) = @_;
- if ($s =~ m/^\s/)
- {
- $s = "./$s";
- }
- if ($s =~ m/\s$/)
- {
- $s = "$s\0";
- }
- return $s;
-}
-
=item C<find_file ($file_name, @include)>
Return the first path for a C<$file_name> in the C<include>s.
@@ -168,7 +141,7 @@ sub update_file ($$;$)
if ($to eq '-')
{
- my $in = new IO::File ("< " . open_quote ($from));
+ my $in = new IO::File $from, "<";
my $out = new IO::File (">-");
while ($_ = $in->getline)
{
@@ -360,7 +333,7 @@ sub contents ($)
my ($file) = @_;
verb "reading $file";
local $/; # Turn on slurp-mode.
- my $f = new Automake::XFile "< " . open_quote ($file);
+ my $f = new Automake::XFile $file, "<";
my $contents = $f->getline;
$f->close;
return $contents;
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
deleted file mode 100644
index b5c93b1..0000000
--- a/lib/Automake/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-# Copyright (C) 2001-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/>.
-
-perllibdir = $(pkgvdatadir)/Automake
-dist_perllib_DATA = \
- ChannelDefs.pm \
- Channels.pm \
- Condition.pm \
- Configure_ac.pm \
- DisjConditions.pm \
- FileUtils.pm \
- General.pm \
- Getopt.pm \
- Item.pm \
- ItemDef.pm \
- Location.pm \
- Options.pm \
- Rule.pm \
- RuleDef.pm \
- Variable.pm \
- VarDef.pm \
- Version.pm \
- XFile.pm \
- Wrap.pm
-
-nodist_perllib_DATA = \
- Config.pm
-
-CLEANFILES = $(nodist_perllib_DATA)
-
-## We can't use configure to do the substitution here; we must do it
-## by hand. We use a funny notation here to avoid configure
-## substitutions in our text.
-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' \
- -e 's,address@hidden@],$(VERSION),g' \
- -e "s,address@hidden@],Generated from $$in.in; do not edit by hand.,g" \
- -e 's,address@hidden@],$(datadir),g'
-
-## This file depends on Makefile so it is rebuilt if $(VERSION),
-## $(datadir) or other do_subst'ituted variables change.
-## Use chmod a-w to prevent people from editing the wrong file by accident.
-Config.pm: Config.in Makefile
- $(AM_V_at)rm -f $@ address@hidden
- $(AM_V_GEN)$(do_subst) $(srcdir)/Config.in >address@hidden
- $(AM_V_at)chmod a+x,a-w address@hidden && mv -f address@hidden $@
-
-EXTRA_DIST = Config.in
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 82edb23..177dad9 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -31,13 +31,13 @@ Automake::XFile - supply object methods for filehandles
with error handling
use Automake::XFile;
$fh = new Automake::XFile;
- $fh->open ("< file");
+ $fh->open ("file", "<");
# No need to check $FH: we died if open failed.
print <$fh>;
$fh->close;
# No need to check the return value of close: we died if it failed.
- $fh = new Automake::XFile "> file";
+ $fh = new Automake::XFile "file", ">";
# No need to check $FH: we died if new failed.
print $fh "bar\n";
$fh->close;
@@ -130,7 +130,7 @@ Die if opening fails. Store the name of the file. Use
binmode for writing.
sub open
{
my $fh = shift;
- my ($file) = @_;
+ my ($file, $mode) = @_;
# WARNING: Gross hack: $FH is a typeglob: use its hash slot to store
# the 'name' of the file we are opening. See the example with
@@ -147,7 +147,12 @@ sub open
# (This circumvents a bug in at least Cygwin bash where the shell
# parsing fails on lines ending with the continuation character '\'
# and CRLF).
- binmode $fh if $file =~ /^\s*>/;
+ # Correctly recognize usages like:
+ # - open ($file, "w")
+ # - open ($file, "+<")
+ # - open (" >$file")
+ binmode $fh
+ if (defined $mode && $mode =~ /^[+>wa]/ or $file =~ /^\s*>/);
}
=item C<$fh-E<gt>close>
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fb80351..b7f23cd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,7 +17,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/>.
-SUBDIRS = Automake am
+EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
+
+## -------------------------------------------------------------------- ##
+## Auxiliary scripts and files for use with "automake --add-missing". ##
+## -------------------------------------------------------------------- ##
dist_pkgvdata_DATA = \
COPYING \
@@ -36,7 +40,6 @@ dist_script_DATA = \
mkinstalldirs \
elisp-comp \
ylwrap \
- acinstall \
depcomp \
compile \
py-compile \
@@ -45,8 +48,6 @@ dist_script_DATA = \
tap-driver.sh \
tap-driver.pl
-EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
-
install-data-hook:
@$(POST_INSTALL)
@for prog in $(dist_script_DATA); do \
@@ -61,3 +62,101 @@ installcheck-local:
done \
| sed 's/$$/: not executable/' \
| grep . && exit 1; exit 0
+
+## ---------------------------------------------------- ##
+## Private perl modules used by automake and aclocal. ##
+## ---------------------------------------------------- ##
+
+perllibdir = $(pkgvdatadir)/Automake
+dist_perllib_DATA = \
+ Automake/ChannelDefs.pm \
+ Automake/Channels.pm \
+ Automake/Condition.pm \
+ Automake/Configure_ac.pm \
+ Automake/DisjConditions.pm \
+ Automake/FileUtils.pm \
+ Automake/General.pm \
+ Automake/Getopt.pm \
+ Automake/Item.pm \
+ Automake/ItemDef.pm \
+ Automake/Location.pm \
+ Automake/Options.pm \
+ Automake/Rule.pm \
+ Automake/RuleDef.pm \
+ Automake/Variable.pm \
+ Automake/VarDef.pm \
+ Automake/Version.pm \
+ Automake/XFile.pm \
+ Automake/Wrap.pm
+
+nodist_perllib_DATA = Automake/Config.pm
+CLEANFILES = $(nodist_perllib_DATA)
+
+## We can't use configure to do the substitution here; we must do it
+## by hand. We use a funny notation here to avoid configure
+## substitutions in our text.
+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' \
+ -e 's,address@hidden@],$(VERSION),g' \
+ -e "s,address@hidden@],Generated from $$in.in; do not edit by hand.,g" \
+ -e 's,address@hidden@],$(datadir),g'
+
+## This file depends on Makefile so it is rebuilt if $(VERSION),
+## $(datadir) or other do_subst'ituted variables change.
+## Use chmod a-w to prevent people from editing the wrong file by accident.
+Automake/Config.pm: Automake/Config.in Makefile
+ $(AM_V_at)rm -f $@ address@hidden
+ $(AM_V_at)test -d Automake || mkdir Automake
+ $(AM_V_GEN)$(do_subst) $(srcdir)/Automake/Config.in >address@hidden
+ $(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
+EXTRA_DIST += Automake/Config.in
+
+## --------------------- ##
+## Makefile fragments. ##
+## --------------------- ##
+
+dist_am_DATA = \
+ am/check.am \
+ am/check2.am \
+ am/clean-hdr.am \
+ am/clean.am \
+ am/compile.am \
+ am/configure.am \
+ am/data.am \
+ am/dejagnu.am \
+ am/depend.am \
+ am/depend2.am \
+ am/distdir.am \
+ am/footer.am \
+ am/header-vars.am \
+ am/header.am \
+ am/install.am \
+ am/inst-vars.am \
+ am/java.am \
+ am/lang-compile.am \
+ am/lex.am \
+ am/library.am \
+ am/libs.am \
+ am/libtool.am \
+ am/lisp.am \
+ am/ltlib.am \
+ am/ltlibrary.am \
+ am/mans-vars.am \
+ am/mans.am \
+ am/program.am \
+ am/progs.am \
+ am/python.am \
+ am/remake-hdr.am \
+ am/scripts.am \
+ am/subdirs.am \
+ am/tags.am \
+ am/texi-vers.am \
+ am/texibuild.am \
+ am/texinfos.am \
+ am/vala.am \
+ am/yacc.am
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/lib/am/Makefile.am b/lib/am/Makefile.am
deleted file mode 100644
index ff4771c..0000000
--- a/lib/am/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake lib/am.
-
-# Copyright (C) 1995-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/>.
-
-dist_am_DATA = \
-check.am \
-check2.am \
-clean-hdr.am \
-clean.am \
-compile.am \
-configure.am \
-data.am \
-dejagnu.am \
-depend.am \
-depend2.am \
-distdir.am \
-footer.am \
-header-vars.am \
-header.am \
-install.am \
-inst-vars.am \
-java.am \
-lang-compile.am \
-lex.am \
-library.am \
-libs.am \
-libtool.am \
-lisp.am \
-ltlib.am \
-ltlibrary.am \
-mans-vars.am \
-mans.am \
-program.am \
-progs.am \
-python.am \
-remake-hdr.am \
-scripts.am \
-subdirs.am \
-tags.am \
-texi-vers.am \
-texibuild.am \
-texinfos.am \
-vala.am \
-yacc.am
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index bc89bcf..a49022e 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -68,8 +68,11 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
## Do not use '-o' unless necessary: it is only supported since Texinfo 4.1.
## texi2dvi doesn't silence everything with -q, redirect to /dev/null instead.
## We still want -q (%TEXIQUIET%) because it turns on batch mode.
-?GENERIC? $(TEXI2DVI) %TEXIQUIET% %SOURCE% %TEXIDEVNULL%
-?!GENERIC? $(TEXI2DVI) %TEXIQUIET% -o $@ `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
+## Use '--clean' to avoid leaving auxiliary files behind cluttering the build
+## directory (see automake bug#11146). We should start using '--tidy' when we
+## can assume Texinf 4.9 or later.
+?GENERIC? $(TEXI2DVI) %TEXIQUIET% --clean %SOURCE% %TEXIDEVNULL%
+?!GENERIC? $(TEXI2DVI) %TEXIQUIET% --clean -o $@ `test -f '%SOURCE%' ||
echo '$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
?GENERIC?%SOURCE_SUFFIX%.pdf:
?!GENERIC?%DEST_PREFIX%.pdf: %SOURCE% %DEPS% %DIRSTAMP%
@@ -80,8 +83,11 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
## Do not use '-o' unless necessary: it is only supported since Texinfo 4.1.
## texi2pdf doesn't silence everything with -q, redirect to /dev/null instead.
## We still want -q (%TEXIQUIET%) because it turns on batch mode.
-?GENERIC? $(TEXI2PDF) %TEXIQUIET% %SOURCE% %TEXIDEVNULL%
-?!GENERIC? $(TEXI2PDF) %TEXIQUIET% -o $@ `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
+## Use '--clean' to avoid leaving auxiliary files behind cluttering the build
+## directory (see automake bug#11146). We should start using '--tidy' when we
+## can assume Texinf 4.9 or later.
+?GENERIC? $(TEXI2PDF) %TEXIQUIET% --clean %SOURCE% %TEXIDEVNULL%
+?!GENERIC? $(TEXI2PDF) %TEXIQUIET% --clean -o $@ `test -f '%SOURCE%' ||
echo '$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
?GENERIC?%SOURCE_SUFFIX%.html:
?!GENERIC?%DEST_PREFIX%.html: %SOURCE% %DEPS% %DIRSTAMP%
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 fc35610..a4d5a12 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.
diff --git a/tests/link_cond.test b/tests/link_cond.test
index 7b9fd5a..6d1761a 100755
--- a/tests/link_cond.test
+++ b/tests/link_cond.test
@@ -62,11 +62,11 @@ main ()
END
./configure have_cxx=no
-CXX=false $MAKE -e
+$MAKE CXX=false
# Sanity check.
rm -f foo foo.exe
-CC=false $MAKE -e && Exit 99
+$MAKE CC=false && Exit 99
$MAKE distclean
@@ -81,10 +81,10 @@ int main (void)
END
./configure have_cxx=yes
-CC=false $MAKE -e
+$MAKE CC=false
# Sanity check.
rm -f foo foo.exe
-CXX=false $MAKE -e && Exit 99
+$MAKE CXX=false && Exit 99
:
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 25b1310..69a391f 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -1155,7 +1155,6 @@ txinfo10.test \
txinfo13.test \
txinfo16.test \
txinfo17.test \
-txinfo18.test \
txinfo19.test \
txinfo20.test \
txinfo21.test \
@@ -1171,6 +1170,7 @@ txinfo30.test \
txinfo31.test \
txinfo32.test \
txinfo33.test \
+txinfo-no-clutter.test \
txinfo-unrecognized-extension.test \
transform.test \
transform2.test \
diff --git a/tests/txinfo-no-clutter.test b/tests/txinfo-no-clutter.test
new file mode 100755
index 0000000..ae5e9f2
--- /dev/null
+++ b/tests/txinfo-no-clutter.test
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 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/>.
+
+# The pdf, ps and dvi targets shouldn't let clutter in the build directory.
+# Related to automake bug#11146.
+
+required='makeinfo tex texi2dvi-o dvips'
+. ./defs || Exit 1
+
+mkdir sub
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am << 'END'
+all-local: ps pdf dvi html
+info_TEXINFOS = foo.texi sub/bar.texi
+END
+
+cat > foo.texi << 'END'
+\input texinfo
address@hidden foo.info
address@hidden foo
address@hidden Top
+Hello walls.
address@hidden version.texi
address@hidden
+END
+
+cat > sub/bar.texi << 'END'
+\input texinfo
address@hidden bar.info
address@hidden bar
address@hidden Top
+Hello walls.
address@hidden version2.texi
address@hidden
+END
+
+cat > baz.texi << 'END'
+\input texinfo
address@hidden baz.info
address@hidden baz
address@hidden Top
+Hello walls.
address@hidden
+END
+
+cat > baz.texi << 'END'
+\input texinfo
address@hidden baz.info
address@hidden baz
address@hidden au
address@hidden sa
address@hidden sb
address@hidden sa sb
address@hidden Top
+Hello walls.
address@hidden foo
+foo
address@hidden bar
+bar
address@hidden baz
+baz
address@hidden sa
+sa
address@hidden sb
+sb
address@hidden
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+./configure
+
+# Try one by one, to ensure later targets don't involuntarily
+# clean up potential cruft left by earlier ones.
+for fmt in info pdf ps dvi html all; do
+ $MAKE $fmt
+ ls -l . sub # For debugging.
+ ls -d foo* baz* sub/bar* > lst
+ $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info)$' lst && Exit 1
+ $MAKE clean
+done
+
+$MAKE distcheck
+
+:
diff --git a/tests/txinfo18.test b/tests/txinfo18.test
deleted file mode 100755
index 22b096b..0000000
--- a/tests/txinfo18.test
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# 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
-# 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/>.
-
-# Make sure we clean index files, even if they are not used at the top-level.
-# Only *new* indexes need to be declared at the top-level.
-# PR/375.
-
-required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi
-main_TEXINFOS = sub.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
address@hidden main.info
address@hidden main
address@hidden au
address@hidden sa
address@hidden sb
address@hidden sa sb
address@hidden Top
-Hello walls.
address@hidden sub.texi
address@hidden
-END
-
-cat > sub.texi << 'END'
address@hidden foo
-foo
address@hidden bar
-bar
address@hidden baz
-baz
address@hidden sa
-sa
address@hidden sb
-sb
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure
-
-$MAKE dvi
-ls -l # For debugging.
-test -f main.sa # Sanity check.
-$MAKE clean
-ls -l # For debugging.
-test x"`echo main.*`" = x"main.texi"
-
-TAR_OPTIONS= $MAKE distcheck
-
-:
diff --git a/tests/vala-mix2.test b/tests/vala-mix2.test
index 5162467..5da5629 100755
--- a/tests/vala-mix2.test
+++ b/tests/vala-mix2.test
@@ -17,7 +17,7 @@
# Vala sources, C and C++ sources and C and C++ headers in the same
# program. Functional test. See automake bug#10894.
-required='valac cc c++ GNUmake'
+required='valac cc c++'
. ./defs || Exit 1
cat >> configure.ac <<'END'
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. ng-0.5a-172-g5edc5fc,
Stefano Lattarini <=