[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-74
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-74-gbfd7cc5 |
|
Date: |
Wed, 09 Jan 2013 12:12:49 +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=bfd7cc5a7e2f4dbfa9b6c6188029b6fe345eba81
The branch, master has been updated
via bfd7cc5a7e2f4dbfa9b6c6188029b6fe345eba81 (commit)
via 8971d23fb05a19fcb75a7b8c4c66cf402b1037a4 (commit)
via c328a53e07d3c5158e2b6458be8d0284e042c7e5 (commit)
via a28f99b5a17a3930fb67978a8e42c4b3fe0ffeb9 (commit)
via 965b8b367162c84f431d68877f97422a00f428ed (commit)
via 744cd575c103166ed2b9e8ea1e8013f3e3e25bfe (commit)
via 285d7b14cc55c047c432e3ed7322cb1a4f96aab2 (commit)
via 0ac78fd0580fa4c9b367b61b53120acf5eab9f53 (commit)
via 7965844e6ec5722785fd3b01f6ea00ca059c0112 (commit)
via 297dca7e9b1fd78e6bd441cefe3d16a2c863d687 (commit)
via 0071e0155c0881ef7cafd7b8f9a796e8377fc6db (commit)
via fa0fc1bf55b423a401c98dff0cc0dcdb83136b8e (commit)
via 5df23a7accb0e82109898f02818c2f65a0bb7b91 (commit)
via 6a67b29744ba72ff9ed6a12349a65b1e4a23f3a6 (commit)
via a5ebf351f7d41aff1e3716930d687096b3d4475d (commit)
via 5fdf75877fd22aed951678d92b291b3b7ca1926f (commit)
from e4fc1dad85ab0a6f3f408a2f74059b826457b4dd (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 bfd7cc5a7e2f4dbfa9b6c6188029b6fe345eba81
Merge: 7965844 8971d23
Author: Stefano Lattarini <address@hidden>
Date: Wed Jan 9 12:04:52 2013 +0100
Merge branch 'maint'
* maint:
tests: adjust stale references to old test names
tests: rename the last aclocal test with dumb name
tests: fix an old botched change to an aclocal test
tests: fix some botched inter-test references in heading comments
coverage: compile rules used "-c -o" also with losing compilers
texi: remove extra verbosity in creation of dirstamp directory
coverage: user can avoid distributing '.info' pages
plans: add some on-going plans (already registered on the bug tracker)
docs: mention dist-hook help for EXTRA_DIST
texi: remove workaround for older Texinfo (4.1)
NEWS: improve wordings in entry deprecating suffix-less info files
plans: add the "PLANS" directory
commit 7965844e6ec5722785fd3b01f6ea00ca059c0112
Author: Stefano Lattarini <address@hidden>
Date: Fri Jan 4 18:35:06 2013 +0100
texi: remove leftover support for DGJPP '.iNN' info files
A follow-up to commit 'v1.13-6-gad08bbf'.
* lib/am/texinfos.am (dist-info): Stop catering to info files
with '.iNN' extension (as in '.i23' or '.i02').
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 +-
NEWS | 10 +++-
PLANS/README | 25 +++++++
PLANS/obsolete-removed/am-prog-mkdir-p.txt | 67 ++++++++++++++++++++
PLANS/obsolete-removed/configure.in.txt | 28 ++++++++
PLANS/texi/drop-split-info-files.txt | 27 ++++++++
.../warnings-for-automake-ng-compatibility.txt | 21 ++++++
doc/automake.texi | 4 +-
lib/am/texi-vers.am | 2 +-
lib/am/texibuild.am | 10 +---
lib/am/texinfos.am | 3 +-
t/{acloca10.sh => aclocal-I-and-install.sh} | 4 +-
t/aclocal-I-order-2.sh | 2 +-
t/aclocal-I-order-3.sh | 2 +-
t/aclocal-pr450.sh | 4 +-
t/{ccnoco3.sh => ccnoco4.sh} | 36 ++++-------
t/list-of-tests.mk | 5 +-
t/remake-renamed-m4-macro-and-file.sh | 2 +-
t/{autodist-stamp-vti.sh => txinfo-nodist-info.sh} | 48 ++++++++------
19 files changed, 239 insertions(+), 64 deletions(-)
create mode 100644 PLANS/README
create mode 100644 PLANS/obsolete-removed/am-prog-mkdir-p.txt
create mode 100644 PLANS/obsolete-removed/configure.in.txt
create mode 100644 PLANS/texi/drop-split-info-files.txt
create mode 100644 PLANS/texi/warnings-for-automake-ng-compatibility.txt
rename t/{acloca10.sh => aclocal-I-and-install.sh} (97%)
copy t/{ccnoco3.sh => ccnoco4.sh} (67%)
copy t/{autodist-stamp-vti.sh => txinfo-nodist-info.sh} (58%)
diff --git a/Makefile.am b/Makefile.am
index 78aabbf..463cb53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,8 @@ EXTRA_DIST += \
$(AUTOMAKESOURCES) \
bootstrap.sh \
GNUmakefile \
- HACKING
+ HACKING \
+ PLANS
# Make versioned links. We only run the transform on the root name;
# then we make a versioned link with the transformed base name. This
diff --git a/NEWS b/NEWS
index a1842c3..e36d1cf 100644
--- a/NEWS
+++ b/NEWS
@@ -109,7 +109,15 @@ New in 1.13.2:
- Use of suffix-less info files (that can be specified through the
'@setfilename' macro in Texinfo input files) is discouraged, and
- its use will raise warnings in the 'obsolete' category.
+ its use will raise warnings in the 'obsolete' category. Simply
+ use the '.info' extension for all your info files, transforming
+ usages like:
+
+ @setfilename myprogram
+
+ into:
+
+ @setfilename myprogram.info
- Use of Texinfo input files with '.txi' or '.texinfo' extensions
is discouraged, and its use will raise warnings in the 'obsolete'
diff --git a/PLANS/README b/PLANS/README
new file mode 100644
index 0000000..87cb8dc
--- /dev/null
+++ b/PLANS/README
@@ -0,0 +1,25 @@
+"Plans" for future or on-going Automake development.
+
+The contents is meant to help ensure a more controlled and smooth
+development and evolution for Automake, in several ways.
+
+ - Having the plans clearly spelled out should will avoid messy
+ roadmaps with no clear way forward or with muddy or ill-defined
+ aims or purposes; a trap this is too easy to fall into.
+
+ - Keeping planned changes cooking and re-hashed for a while should
+ ensure rough edges are smoothed up, transitions are planned in a
+ proper way (hopefully avoiding debacles like the AM_MKDIR_PROG_P
+ deprecation and the AM_CONFIG_HEADER too-abrupt removal), and
+ "power users" have more chances of getting informed in due time,
+ thus having all the time to prepare for the changes or raise
+ objections against them.
+
+ - Having the plans clearly stated and registered in a "centralized"
+ location should make it more difficult to them to slip through
+ the cracks, getting forgotten or (worse) only half-implemented.
+
+ - Even for discussions and plans registered on the Bug Tracker
+ as well, a corresponding entry in the PLANS directory can help
+ in keeping main ideas summarized, and consensus and/or objections
+ registered and easily compared.
diff --git a/PLANS/obsolete-removed/am-prog-mkdir-p.txt
b/PLANS/obsolete-removed/am-prog-mkdir-p.txt
new file mode 100644
index 0000000..b096ece
--- /dev/null
+++ b/PLANS/obsolete-removed/am-prog-mkdir-p.txt
@@ -0,0 +1,67 @@
+In Automake 1.13.x
+------------------
+
+We had already scheduled the removal of the long-deprecated AM_PROG_MKDR_P
+macro (superseded by the autoconf-provided one AC_PROG_MKDIR_P) for
+Automake 1.13 -- see commit 'v1.12-20-g8a1c64f'.
+
+Alas, it turned out the latest Gettext version at the time (0.18.1.1) was
+still using that macro:
+
+ <http://lists.gnu.org/archive/html/automake/2012-09/msg00010.html>
+
+And since the maintenance of Gettext was stalled, we couldn't get a fix
+committed and released in time for the appearance of automake 1.13:
+
+ <http://lists.gnu.org/archive/html/bug-gettext/2012-04/msg00018.html>
+ <http://lists.gnu.org/archive/html/bug-gettext/2012-06/msg00012.html>
+ <http://lists.gnu.org/archive/html/bug-gettext/2012-10/msg00001.html>
+
+So, on a strong advice by Jim Meyering, in commit 'v1.12.4-158-gdf23daf'
+we re-introduced AM_PROG_MKDIR_P in Automake. That has been an
+unfortunate necessity (thanks to Jim for having convinced me of that in
+time!)
+
+
+For Automake 1.14
+-----------------
+
+Finally, AM_PROG_MKDR_P we'll be fully obsolete in in Automake 1.14 (see
+commit 'v1.12.4-174-g5a28948', merged in master by 'v1.13-5-gb373ad9'),
+while still offering a clear error message for the moment (see follow-up
+commit 'v1.13-30-gd01834b').
+
+We can finally do so because Gettext has got a maintainer in the meantime,
+and a new release has been made that no longer uses AM_PROG_MKDIR_P:
+
+ <http://lists.gnu.org/archive/html/bug-gettext/2012-12/msg00064.html>
+
+We still keep the obsolete '@mkdir_p@' substitution and '$(mkdir_p)'
+variable around though, since they are still used by 'Makefile.in.in'
+template from gettext:
+
+ $ cd ~/src/gettext
+ $ git checkout master
+ $ git describe
+ v0.18.2-4-g3188bbf
+ $ grep mkdir_p gettext-runtime/po/Makefile.in.in | grep -v '^#'
+ mkdir_p = @mkdir_p@
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$$dir; \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$$dir; \
+
+(see also Automake commit v1.12.1-112-g2551021).
+
+More to the point, it's almost impossible to diagnose usages of those
+macro and substitution using the existing Automake parsing and warning
+infrastructure; it's much easier to just keep them around for a while.
+
+
+The future
+----------
+
+We want to finally remove '@mkdir_p@' and '$(mkdir_p)' as well some
+day. It would be nice if we could do so with some kind of deprecation,
+but that is not worth too much work. Anyway, no hurry an no high
+priority for this removal.
diff --git a/PLANS/obsolete-removed/configure.in.txt
b/PLANS/obsolete-removed/configure.in.txt
new file mode 100644
index 0000000..baed853
--- /dev/null
+++ b/PLANS/obsolete-removed/configure.in.txt
@@ -0,0 +1,28 @@
+In Automake 1.13.x
+------------------
+
+We are already warning about 'configure.in' used as the name for the
+Autoconf input file ('configure.ac' should be used instead); we've
+been doing that since Automake 1.12.4.
+
+We had scheduled to remove support for it altogether in Automake 1.13
+(and announced that in our NEWS file), because we thought that Autoconf
+too would have started deprecating it by the time our 1.13 release was
+done. Alas, this hasn't been the case: the deprecation code is only
+present in the development version of autoconf so far (scheduled to
+become Autoconf 2.70). So ...
+
+
+For Automake 1.14
+-----------------
+
+... we have decided to wait until 2.70 is out before really removing
+'configure.in' support. Since we plan to require Autoconf 2.70 in
+Automake 1.14 (so that we can remove the hacky code emulating
+AC_CONFIG_MACRO_DIRS for older autoconf versions), we are quite sure
+that Autoconf will actually have started deprecating 'configure.in'
+by the time Automake 1.14 is released.
+
+Note that the removal of 'configure.in' has already been implemented
+in our master branch (from where the 1.14 release will be finally
+cut); see commits 'v1.13-17-gbff57c8' and 'v1.13-21-g7626e63'.
diff --git a/PLANS/texi/drop-split-info-files.txt
b/PLANS/texi/drop-split-info-files.txt
new file mode 100644
index 0000000..7084331
--- /dev/null
+++ b/PLANS/texi/drop-split-info-files.txt
@@ -0,0 +1,27 @@
+For automake 1.14
+-----------------
+
+We want to drop split info files in Automake 1.14.
+See automake bug#13351: <http://debbugs.gnu.org/13351>.
+
+Basically, it has been confirmed that the original reason behind
+the existence of split info files was indeed "efficiency,
+especially memory size":
+<http://lists.gnu.org/archive/html/texinfo-devel/2012-08/msg00024.html>
+
+So split info files have lost their reason d'etre on modern systems
+(where even Emacs has become a lightweight program ;-). And you are
+not using an embedded system to read Info documentation, right?
+
+In addition, it appears that the use of split info files (at least
+the way Automake-generated rules have been handling them for a long
+time) can cause real problems in some (admittedly quite corner-case)
+situations; see automake bug#12320: <http://debbugs.gnu.org/12320>.
+
+This change should be completely transparent to the developer (no
+adjustments needed to be made to Makefile.am or other parts of the
+build system). In case some CI system or overly picky build script
+used to rely on that feature, they'll have to be adjusted; but that
+is expected to be a rare occurrence, and thus a price worth pay for
+the nice simplifications and the fixlets this planned change will
+offer us.
diff --git a/PLANS/texi/warnings-for-automake-ng-compatibility.txt
b/PLANS/texi/warnings-for-automake-ng-compatibility.txt
new file mode 100644
index 0000000..1dd3da3
--- /dev/null
+++ b/PLANS/texi/warnings-for-automake-ng-compatibility.txt
@@ -0,0 +1,21 @@
+For automake 1.13.2:
+--------------------
+
+I have discouraged the use of '.txi' and '.texinfo' suffixes for
+Texinfo inputs (see commit 'v1.13.1-6-ge1ed314') and the generation
+of suffix-less info files (commit 'v1.13.1-4-g2af418d').
+
+This is done to ease transition to Automake-NG (see commits
+'v1.12.1-416-gd5459b9' and 'v1.12.1-392-ga0c7b6a' there), and
+(to a lesser degree) to discourage use of seldom-tested setups.
+
+
+The Future:
+-----------
+
+I have no plans to do the further step of removing support for those
+usages in future Automake versions. That would be a gratuitous
+incompatibility (in Automake-NG, they have been useful because have
+allowed further refactorings and improvements, but those were
+based on GNU make features, and as such have no place in mainline
+Automake).
diff --git a/doc/automake.texi b/doc/automake.texi
index b1e3a8c..496306c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8364,7 +8364,9 @@ You can also mention a directory in @code{EXTRA_DIST}; in
this case the
entire directory will be recursively copied into the distribution.
Please note that this will also copy @emph{everything} in the directory,
including, e.g., Subversion's @file{.svn} private directories or CVS/RCS
-version control files. We recommend against using this feature.
+version control files; thus we recommend against using this feature
+as-is. However, you can use the @code{dist-hook} feature to
+ameliorate the problem; @pxref{The dist Hook}.
@vindex SUBDIRS
@vindex DIST_SUBDIRS
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 3f91cf1..bddf382 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -31,7 +31,7 @@ DIST_COMMON += %VTEXI% %STAMPVTI%
## %STAMPVTI% is distributed and %DIRSTAMP% isn't: a distributed file
## should never be dependent upon a non-distributed built file.
## Therefore we ensure that %DIRSTAMP% exists in the rule.
-?DIRSTAMP? test -f %DIRSTAMP% || $(MAKE) $(AM_MAKEFLAGS) %DIRSTAMP%
+?DIRSTAMP? @test -f %DIRSTAMP% || $(MAKE) $(AM_MAKEFLAGS) %DIRSTAMP%
@(dir=.; test -f ./%TEXI% || dir=$(srcdir); \
set `$(SHELL) %MDDIR%mdate-sh $$dir/%TEXI%`; \
echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 2e2a6e1..8adf5a9 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -109,15 +109,9 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
?GENERIC? -o $(@:.html=.htp) %SOURCE%; \
?!GENERIC? -o $(@:.html=.htp) `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%; \
then \
- rm -rf $@; \
-## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/
-## instead of foo.html/).
- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
- mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+ rm -rf $@ && mv $(@:.html=.htp) $@; \
else \
- if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
- rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
- exit 1; \
+ rm -rf $(@:.html=.htp); exit 1; \
fi
## If we are using the generic rules, we need separate dependencies.
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index a7c1ff2..9b92920 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -346,8 +346,7 @@ dist-info: $(INFO_DEPS)
$(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$base; then d=.; else d=$(srcdir); fi; \
- base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
- for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9]
$$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
+ for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9]; do \
if test -f $$file; then \
## Strip leading '$$d/'.
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
diff --git a/t/acloca10.sh b/t/aclocal-I-and-install.sh
similarity index 97%
rename from t/acloca10.sh
rename to t/aclocal-I-and-install.sh
index 632e816..7c1b0d4 100755
--- a/t/acloca10.sh
+++ b/t/aclocal-I-and-install.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Make sure aclocal define macros in the same order as -I's.
-# This is the same as aclocal-I-order-1.sh, with the macro calls
+# This is the similar to aclocal-I-order-1.sh, with the macro calls
# reversed (it did make a difference).
#
# Also check for --install.
@@ -28,8 +28,8 @@ am_create_testdir=empty
cat > configure.ac << 'END'
AC_INIT
-MACRO1
MACRO2
+MACRO1
MACRO3
END
diff --git a/t/aclocal-I-order-2.sh b/t/aclocal-I-order-2.sh
index fd58b4e..c3fe00a 100755
--- a/t/aclocal-I-order-2.sh
+++ b/t/aclocal-I-order-2.sh
@@ -16,7 +16,7 @@
# Make sure that when two files define the same macro in the same
# directory, the macro from the lexically greatest file is used.
-# See also sister test 'aclocal-I-ordering-2.sh'.
+# See also sister test 'aclocal-I-order-3.sh'.
am_create_testdir=empty
. test-init.sh
diff --git a/t/aclocal-I-order-3.sh b/t/aclocal-I-order-3.sh
index d2077fe..4fcbf4c 100755
--- a/t/aclocal-I-order-3.sh
+++ b/t/aclocal-I-order-3.sh
@@ -16,7 +16,7 @@
# Make sure that when two files define the same macro in the same
# directory, the macro from the lexically greatest file is used.
-# Same as acloca-I-ordering.sh, but without calling MACRO2.
+# Same as aclocal-I-order-2.sh, but without calling MACRO2.
am_create_testdir=empty
. test-init.sh
diff --git a/t/aclocal-pr450.sh b/t/aclocal-pr450.sh
index 7f4796f..184cc33 100755
--- a/t/aclocal-pr450.sh
+++ b/t/aclocal-pr450.sh
@@ -20,8 +20,8 @@
. test-init.sh
-cat >configure.ac <<'END'
-AC_INIT([acloca19], [1.0])
+cat >configure.ac <<END
+AC_INIT([$me], [1.0])
m4_include([aconfig.ac])
FOO
AC_OUTPUT
diff --git a/t/ccnoco3.sh b/t/ccnoco4.sh
similarity index 67%
copy from t/ccnoco3.sh
copy to t/ccnoco4.sh
index 7ad5b3b..54b857a 100755
--- a/t/ccnoco3.sh
+++ b/t/ccnoco4.sh
@@ -14,34 +14,30 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to make sure 'compile' doesn't call 'mv SRC SRC'.
+# Check that Automake doesn't pass "-c -o" to losing compiler when
+# the 'subdir-objects' is used but sources are only present in the
+# top-level directory. Reported by Nick Bowler in the discussion on
+# automake bug#13378:
+# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#35>
+# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13378#44>
required=gcc
. test-init.sh
+# We deliberately do not call AM_PROG_CC_C_O here.
cat >> configure.ac << 'END'
AC_PROG_CC
-AM_PROG_CC_C_O
$CC --version; $CC -v; # For debugging.
AC_OUTPUT
END
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = wish
-wish_SOURCES = a.c
+bin_PROGRAMS = foo bar
+bar_SOURCES = foo.c
END
-mkdir sub
-
-cat > a.c << 'END'
-#include <stdio.h>
-
-int main ()
-{
- printf ("hi\n");
-}
-END
+echo 'int main (void) { return 0; }' > foo.c
cat > Mycomp << END
#!/bin/sh
@@ -59,7 +55,7 @@ END
chmod +x Mycomp
-# Make sure the compiler doesn't understand '-c -o'
+# Make sure the compiler doesn't understand '-c -o'.
CC=$(pwd)/Mycomp
export CC
@@ -67,12 +63,8 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE --copy --add-missing
-mkdir build
-cd build
-
-../configure
-$MAKE 2>stderr || { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep 'mv.*the same file' stderr && exit 1
+./configure
+$MAKE
+$MAKE distcheck
:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index e8efe45..92f786a 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -30,6 +30,7 @@ t/pm/Version3.pl
XFAIL_TESTS = \
t/all.sh \
+t/ccnoco4.sh \
t/cond17.sh \
t/gcj6.sh \
t/override-conditional-2.sh \
@@ -71,10 +72,10 @@ t/get-sysconf.sh \
$(perl_TESTS) \
t/instspc.tap \
t/aclocal.sh \
-t/acloca10.sh \
t/aclocal-I-order-1.sh \
t/aclocal-I-order-2.sh \
t/aclocal-I-order-3.sh \
+t/aclocal-I-and-install.sh \
t/aclocal-acdir.sh \
t/aclocal-amflags.sh \
t/aclocal-autoconf-version-check.sh \
@@ -210,6 +211,7 @@ t/canon-name.sh \
t/ccnoco.sh \
t/ccnoco2.sh \
t/ccnoco3.sh \
+t/ccnoco4.sh \
t/check.sh \
t/check2.sh \
t/check4.sh \
@@ -1166,6 +1168,7 @@ t/txinfo-info-in-srcdir.sh \
t/txinfo-makeinfo-error-no-clobber.sh \
t/txinfo-many-output-formats.sh \
t/txinfo-many-output-formats-vpath.sh \
+t/txinfo-nodist-info.sh \
t/txinfo-no-clutter.sh \
t/txinfo-no-extra-dist.sh \
t/txinfo-no-installinfo.sh \
diff --git a/t/remake-renamed-m4-macro-and-file.sh
b/t/remake-renamed-m4-macro-and-file.sh
index 9a1a925..6b09738 100755
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -16,7 +16,7 @@
# Test remake rules when an m4 file gets renamed and *simultaneously*
# an m4 macro in it gets renamed. Kudos to Bruno Haible for thinking
-# about this situation. See also related test 'acloca22.sh'.
+# about this situation. See also related test 'aclocal-deleted-header.sh'.
. test-init.sh
diff --git a/t/autodist-stamp-vti.sh b/t/txinfo-nodist-info.sh
similarity index 58%
copy from t/autodist-stamp-vti.sh
copy to t/txinfo-nodist-info.sh
index 3bb31f9..265587e 100755
--- a/t/autodist-stamp-vti.sh
+++ b/t/txinfo-nodist-info.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2013 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,45 +14,53 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that 'stamp-vti' is automatically distributed when info_TEXINFOS
-# and version.texi are involved.
-# Related to automake bug#7819.
+# Check that we can force generated '.info' info files not to be
+# distributed.
required=makeinfo
. test-init.sh
-cat >> configure.ac << END
-AC_OUTPUT
-END
+echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = info-in-builddir
info_TEXINFOS = foo.texi
-.PHONY: test
-test: all distdir
- ls -l $(distdir)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti '
- test -f $(distdir)/stamp-vti
+CLEANFILES = foo.info
+
+# To make distcheck work without requiring TeX and texi2dvi.
+dvi:
+
+# Do not distribute generated '.info' files.
+dist-info:
+ @:
END
+mkdir subdir
+
cat > foo.texi << 'END'
\input texinfo
@setfilename foo.info
address@hidden Zardoz
address@hidden foo
@node Top
+Hello walls.
@include version.texi
-bar baz quux
@bye
END
-# Required when using Texinfo.
-: > texinfo.tex
-cp "$am_scriptdir"/mdate-sh .
-
$ACLOCAL
$AUTOCONF
-$AUTOMAKE -a
+$AUTOMAKE -a -Wno-override
./configure
-$MAKE test
+$MAKE distdir
+ls -l . $distdir # For debugging.
+test ! -e foo.info
+test ! -e $distdir/foo.info
+$MAKE
+test -f foo.info
+$MAKE distdir
+ls -l $distdir # For debugging.
+test ! -f $distdir/foo.info
+$MAKE distcheck
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-74-gbfd7cc5,
Stefano Lattarini <=