[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.6-23
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.6-230-gfb21440 |
|
Date: |
Tue, 18 Dec 2012 14:10:27 +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=fb214402c043a70581f19d4856a81362a5a1a0d6
The branch, master has been updated
via fb214402c043a70581f19d4856a81362a5a1a0d6 (commit)
via f4eceb86c31f0d9b1cb76aa88d57676ebb48b342 (commit)
via f3d6ca85d3fc962b77d2e0fbe06cab253394a110 (commit)
via a1f9336b9dee4dcb97dd8488f22b1bc684f956f9 (commit)
via fba280d0923da6ef0d55db11edb0944ee1261987 (commit)
via 37ce97010c0c428663a38b270d843c4a4fad52f2 (commit)
via b869415eb63efcea39162fc24a69eb51d94c3c6b (commit)
via f72c2300ef6043e81b38b6d6c3e9dbafca60253d (commit)
via c54fada1452911bfedebf3f170dc5d0fcd03cd8f (commit)
via 28fcb35dc73d363ed2a5fe4eddf26770212496c9 (commit)
via 9ca75479a7b18b2f5f9bfd78ad6168385acf42e9 (commit)
via c20ee33f6a8946abeca1f26671e03d5c1af42599 (commit)
via 93adb7b2c632120646af7863ba07750274127153 (commit)
via 0093d5e3eb56afd4da47cf7b54a68aae3ffddad3 (commit)
from b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff (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 fb214402c043a70581f19d4856a81362a5a1a0d6
Author: Stefano Lattarini <address@hidden>
Date: Tue Dec 18 12:20:23 2012 +0100
tests: avoid a spurious failure on NetBSD
* t/tags-pr12372.sh (configure.ac): AC_SUBST the LINK variable to a
dummy invocation, to avoid possible errors from make or the linker;
errors we do not care about in the least in this test.
(Makefile.am, sub/Makefile.am): Remove LINK definitions; simply
inherit that in configure.ac.
Signed-off-by: Stefano Lattarini <address@hidden>
commit f4eceb86c31f0d9b1cb76aa88d57676ebb48b342
Author: Stefano Lattarini <address@hidden>
Date: Tue Dec 18 11:51:18 2012 +0100
tests: re-enable some checks disabled by mistake ...
* t/subpkg-macrodir.sh: ... in this test. And fix some typos that would
have caused the newly re-enabled check to spuriously fail. Issue revealed
by the lack of '.PHONY' support in Solaris CCS make (yes, so we've been
actually *helped* by that make implementation once, at last. Scary ;-)
Signed-off-by: Stefano Lattarini <address@hidden>
commit f3d6ca85d3fc962b77d2e0fbe06cab253394a110
Author: Stefano Lattarini <address@hidden>
Date: Tue Dec 18 11:46:40 2012 +0100
tests: avoid a "grep -E" portability issue
As stated in the Autoconf manual, the empty alternative is not portable
with "grep -E". For example, while with GNU grep we have:
$ echo b | grep -E '(|a)b'; echo status = $?
b
status = 0
with Solaris 10 /usr/xpg4/bin/grep we have:
$ echo b | grep -E '(|a)b'; echo status = $?
1
status = 1
* t/silent-texi.sh: That was causing a spurious failure here. Fix it
by simply using '?' instead (as suggested by the Autoconf manual).
Signed-off-by: Stefano Lattarini <address@hidden>
commit a1f9336b9dee4dcb97dd8488f22b1bc684f956f9
Author: Stefano Lattarini <address@hidden>
Date: Tue Dec 18 11:30:39 2012 +0100
tests: avoid a spurious failure due to a Clang bug
This version of clang:
clang version 3.2 (trunk 163574)
Target: powerpc64-unknown-linux-gnu
Thread model: posix
caused the test 't/ltcond2.sh' to spuriously fail due to what
appeared like a clang bug. Here is a part of the diagnostic (trimmed
down for better clarity):
clang: .../cfarm/llvm/lib/MC/MCAsmStreamer.cpp:338: \
virtual void {anonymous}::MCAsmStreamer::EmitLabel(llvm::MCSymbol*): \
Assertion `Symbol->isUndefined() && "Cannot define a symbol twice!"' \
failed.
...
7 clang 0x0000000012a459c4 llvm::AsmPrinter::EmitGlobalVariable\
(llvm::GlobalVariable const*) + 18446744073680468044
8 clang 0x0000000012a490a8 llvm::AsmPrinter::doFinalization\
(llvm::Module&) + 18446744073680481840
...
Stack dump:
0. Program arguments: .../opt/cfarm/clang-2012.09.10/bin/clang \
-cc1 -triple powerpc64-unknown-linux-gnu -S -disable-free \
...
1. <eof> parser at end of file
2. Code generation
3. Running pass 'Function Pass Manager' on module 'hello-generic.c'.
clang: error: unable to execute command: Aborted
clang: error: clang frontend command failed due to signal (use -v to \
see invocation)
clang version 3.2 (trunk 163574)
Target: powerpc64-unknown-linux-gnu
Thread model: posix
So tweak the affected test case to avoid triggering this bug. This is
the easiest way for us to keep the testsuite result clean and meaningful
on our main Clang test bed.
* t/ltcond2.sh: Prefer using "extern const char *" variables rather
than functions returning a statically allocated "const char *" variable.
Signed-off-by: Stefano Lattarini <address@hidden>
commit fba280d0923da6ef0d55db11edb0944ee1261987
Author: Stefano Lattarini <address@hidden>
Date: Sun Dec 16 13:36:14 2012 +0100
NEWS: start preparing for the 1.13 release
* NEWS: Here. In particular, list (some of) the planned future
backward-incompatibilities that will take place in Automake 1.14.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 37ce97010c0c428663a38b270d843c4a4fad52f2
Merge: b8c7e3f b869415
Author: Stefano Lattarini <address@hidden>
Date: Sun Dec 16 13:08:13 2012 +0100
Merge branch 'maint'
* maint:
tests: typofix in the shebang line of 't/py-compile-destdir.sh'
HACKING: release process: fixlets about the announcement
maint: post-release minor version bump
release: stable release 1.12.5
tests: avoid errors due to underquoted third-party macros
maintcheck: also consider contrib tests for syntax checks
cosmetics: whitespace fixlets in syntax-checks.mk
maint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
HACKING | 24 +++++----
NEWS | 135 +++++++++++++++++++----------------------------
maint.mk | 2 +-
syntax-checks.mk | 14 +++---
t/ltcond2.sh | 14 ++----
t/pkg-config-macros.sh | 2 +-
t/py-compile-destdir.sh | 2 +-
t/silent-texi.sh | 4 +-
t/subpkg-macrodir.sh | 18 +++----
t/tags-pr12372.sh | 5 +-
10 files changed, 96 insertions(+), 124 deletions(-)
diff --git a/HACKING b/HACKING
index 4641d90..5dadf1b 100644
--- a/HACKING
+++ b/HACKING
@@ -280,23 +280,27 @@
- Check for link errors, fix them, recheck until convergence:
<http://validator.w3.org/checklink>
+* Create an announcement message with "make announcement". Edit the
+ generated 'announcement' file appropriately, in particularly filling
+ in by hand any "TODO" left in there.
+
* Update version number in configure.ac to next alpha number.
Re-run ./bootstrap.sh and commit.
* Don't forget to "git push" your changes so they appear in the public
git tree.
-* Create an announcement message with "make announcement". Edit the
- generated 'announcement' file appropriately, in particularly filling
- in by hand any "TODO" left in there.
-
-* Send the announcement at least to <address@hidden> and
- <address@hidden>. If the release is a stable one, the announcement
- must also go to <address@hidden>; if it is an alpha or beta release,
- announcement should be sent also to <address@hidden>, to
- maximize the possibility of early testing on exotic or proprietary
- systems. Finally, copy the announcement into the NEWS feed at
+* Send the announcement generated in the earlier steps at least to
+ <address@hidden> and <address@hidden>. If the release
+ is a stable one, the announcement must also go to <address@hidden>;
+ if it is an alpha or beta release, announcement should be sent also
+ to <address@hidden>, to maximize the possibility of early
+ testing on exotic or proprietary systems. Finally, copy an abridged
+ version of the announcement into the NEWS feed at:
<https://savannah.gnu.org/projects/automake>.
+ Be sure to link a version to the complete announcement (from
+ the version you sent to the automake list, as get archived on
+ <http://lists.gnu.org/archive/html/automake/>).
-----
diff --git a/NEWS b/NEWS
index 982233f..c61ec15 100644
--- a/NEWS
+++ b/NEWS
@@ -1,23 +1,61 @@
New in 1.13:
+* WARNING: Future backward-incompatibilities!
+
+ - Automake 1.14 will likely require Autoconf 2.70 or later (which is
+ still unreleased at the moment of writing, but is planned to be
+ released before Automake 1.14 is).
+
+ - Automake 1.14 will likely drop support for the long-deprecated
+ 'configure.in' name for the Autoconf input file. You are advised
+ to use the recommended name 'configure.ac' instead.
+
+ - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
+ be removed in Automake 1.14. The $(mkdir_p) make variable and the
+ @mkdir_p@ substitution will still remain available (as aliases of
+ $(MKDIR_P)) for the moment, for better backward compatibility; but
+ you are advised to stop using ASAP.
+
+ - The ACLOCAL_AMFLAGS special make variable will be fully deprecated
+ in Automake 1.14 (where it will raise warnings in the "obsolete"
+ category). You are advised to start relying on the new Automake
+ support for AC_CONFIG_MACRO_DIRS instead (which is introduced with
+ this release; see below for more information).
+
+ - Support for IRIX and the SGI C/C++ compilers will be removed in
+ Automake 1.14: they have seen their last release in 2006, and SGI
+ is expected to retire support from them in December 2013; see
+ <http://www.sgi.com/services/support/irix_mips_support.html> for
+ more information.
+
+ - Support for the long-deprecated INCLUDES variable will be removed
+ altogether in Automake 1.14. The AM_CPPFLAGS variable should be
+ used instead.
+
+ - Automake-provided scripts and makefile recipes might (finally!)
+ start assuming a POSIX shell in Automake 1.14.
+
+ - Starting from Automake 1.14, third-party m4 files located in the
+ system-wide aclocal directory, as well as in any directory listed
+ in the ACLOCAL_PATH environment variable, will take precedence
+ over "built-in" Automake macros. For example (assuming Automake
+ is installed in the /usr/local hierarchy), a definition of the
+ AM_PROG_VALAC macro found in '/usr/local/share/aclocal/my-vala.m4'
+ should take precedence over the same-named automake-provided macro
+ (defined in '/usr/local/share/aclocal-1.14/vala.m4').
+
* Version requirements:
- - Autoconf 2.65 or greater is required.
+ - Autoconf 2.65 or greater is now required.
- The rules to build PDF and DVI output from Texinfo input now
- requires Texinfo 4.9 or later.
+ require Texinfo 4.9 or later.
+
+* Obsolete features:
- Support for the "Cygnus-style" trees (once enabled by the 'cygnus'
option) has been removed. See discussion about automake bug#11034
- for more background.
-
- - The automake-provided '@mkdir_p@' configure substitution and
- AM_PROG_MKDIR m4 macro have been removed. They had been obsolete
- since automake 1.10, and actively deprecated since Automake 1.12.1.
- However, to maintain a degree of backward-compatibility, the make
- variable '$(mkdir_p)' is still defined (now simple as an alias to
- '$(MKDIR_P)'). It will probably be removed in future major versions
- of Automake (probably 1.14).
+ for more background: <debbugs.gnu.org/11034>.
- The deprecated aclocal option '--acdir' has been removed. You
should use the options '--automake-acdir' and '--system-acdir'
@@ -39,8 +77,6 @@ New in 1.13:
- All the "old alias" macros in 'm4/obsolete.m4' have been removed.
-* Obsolescent features:
-
- Use of the long-deprecated two- and three-arguments invocation forms
of the AM_INIT_AUTOMAKE is no longer documented. It's still supported
though (albeit with a warning in the 'obsolete' category), to cater
@@ -100,6 +136,9 @@ New in 1.13:
* Texinfo Support:
+ - The rules to build PDF and DVI files from Texinfo input now require
+ Texinfo 4.9 or later.
+
- The rules to build PDF and DVI files from Texinfo input now use the
'--build-dir' option, to keep the auxiliary files used by texi2dvi
and texi2pdf around without cluttering the build directory, and to
@@ -139,10 +178,9 @@ New in 1.13:
* Improvements to aclocal and related rebuilds rules:
- Autoconf-provided macros AC_CONFIG_MACRO_DIR and AC_CONFIG_MACRO_DIRS
- (the latter of which will only be present since Autoconf 2.70) are
- now traced by aclocal, and can be used to declare the local m4 include
- directories. Formerly, one had to specify it with an explicit '-I'
- option to the 'aclocal' invocation.
+ are now traced by aclocal, and can be used to declare the local m4
+ include directories. Formerly, one had to specify it with an explicit
+ '-I' option to the 'aclocal' invocation.
- The special make variable ACLOCAL_AMFLAGS is deprecated; future
Automake versions will warn about its use, and later version will
@@ -165,69 +203,6 @@ New in 1.13:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.12.6:
-
-* WARNING: Future backward-incompatibilities!
-
- - Future versions of Automake will likely drop support for the
- long-deprecated 'configure.in' name for the Autoconf input file.
- You are advised to use the recommended name 'configure.ac' instead.
-
- - Support for the "Cygnus-style" trees (as enabled by the 'cygnus'
- option) will be removed in the next major Automake release (1.13).
-
- - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
- be removed in Automake 1.14. The $(mkdir_p) make variable and the
- @mkdir_p@ substitution will still remain available (as aliases of
- $(MKDIR_P)) for the moment, for better backward compatibility.
-
- - Autoconf 2.65 or later will be required by the next major Automake
- version (1.13). Until now, Automake has required Autoconf version
- 2.62 or later.
-
- - Starting from the next major Automake version (1.13), the rules
- to build pdf, ps and dvi output from Texinfo input will use the
- '--build-dir' option by default. Since such an option was only
- 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
- harness will still be available through the use of the 'serial-tests'
- option.
-
- - The following long-obsolete m4 macros will be removed in the
- next major Automake version (1.13):
-
- AM_PROG_CC_STDC: superseded by AC_PROG_CC since October 2002
- fp_PROG_CC_STDC: broken alias for AM_PROG_CC_STDC
- fp_WITH_DMALLOC: old alias for AM_WITH_DMALLOC
- AM_CONFIG_HEADER: superseded by AC_CONFIG_HEADERS since July 2002
- ud_PATH_LISPDIR: old alias for AM_PATH_LISPDIR
- jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
- ud_GNU_GETTEXT: old alias for AM_GNU_GETTEXT
- gm_PROG_LIBTOOL: old alias for AC_PROG_LIBTOOL
- fp_C_PROTOTYPES: old alias for AM_C_PROTOTYPES (which was part
- of the now-removed automatic de-ANSI-fication
- support of Automake)
-
- - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
- the next major Automake version (1.13).
-
- - The '--acdir' option of aclocal is deprecated, and will probably
- be removed in the next major Automake release (1.13). You should
- use the options '--automake-acdir' and '--system-acdir' instead
- (which have been introduced in Automake 1.11.2).
-
- - The 'missing' script will no longer try to update the timestamp
- of out-of-date files that require a maintainer-specific tool to be
- remade, in case the user lacks such a tool (or has a too-old version
- of it). In fact, starting from Automake 1.13, all it'll do will be
- giving more useful warnings than a bare "command not found" from a
- make recipe would.
-
Bugs fixed in 1.12.6:
* Python-related bugs:
diff --git a/maint.mk b/maint.mk
index 236ebc6..9853e6d 100644
--- a/maint.mk
+++ b/maint.mk
@@ -67,7 +67,7 @@ PERL_COVERAGE_FLAGS =
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary
PERL_COVER = cover
check-coverage-run recheck-coverage-run: %-coverage-run: all
- $(mkinstalldirs) $(PERL_COVERAGE_DB)
+ $(MKDIR_P) $(PERL_COVERAGE_DB)
PERL5OPT="$$PERL5OPT $(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
WANT_NO_THREADS=yes; export WANT_NO_THREADS; unset AUTOMAKE_JOBS; \
$(MAKE) $*
diff --git a/syntax-checks.mk b/syntax-checks.mk
index a4dcdf2..042e092 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -105,7 +105,7 @@ sc_diff_automake sc_diff_aclocal: sc_diff_% :
sc_no_brace_variable_expansions:
@if grep -v '^ *#' $(ams) | grep -F '$${' | grep -F -v '$$$$'; then \
echo "Found too many uses of '\$${' in the lines above." 1>&2; \
- exit 1; \
+ exit 1; \
else :; fi
## Make sure 'rm' is called with '-f'.
@@ -115,7 +115,7 @@ sc_rm_minus_f:
| grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
then \
echo "Suspicious 'rm' invocation." 1>&2; \
- exit 1; \
+ exit 1; \
else :; fi
## Never use something like "for file in $(FILES)", this doesn't work
@@ -377,16 +377,16 @@ sc_tests_overriding_macros_on_cmdline:
# code paths.
@tests=`for t in $(xtests); do \
case $$t in */make-dryrun.sh);; *) echo $$t;; esac; \
- done`; \
+ done`; \
if sed -e 's/ || .*//' -e 's/ && .*//' \
-e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \
-e 's/ V=[^ ]*/ /' -e 's/ DISABLE_HARD_ERRORS=[^ ]*/ /' \
-e "s/ DISTCHECK_CONFIGURE_FLAGS='[^']*'/ /" \
- -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
- -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
+ -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
+ -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
-e "s/ exp='[^']*'/ /" \
- -e 's/ exp="[^"]*"/ /' \
- -e 's/ exp=[^ ]/ /' \
+ -e 's/ exp="[^"]*"/ /' \
+ -e 's/ exp=[^ ]/ /' \
$$tests | grep '\$$MAKE .*='; then \
echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above
lines,' 1>&2; \
echo 'it is more portable.' 1>&2; \
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
index a16a7cf..48edede 100755
--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
@@ -56,25 +56,19 @@ check-local:
END
cat > hello-linux.c <<'END'
-const char* str (void)
-{
- return "hello-linux";
-}
+const char* str = "hello-linux";
END
cat > hello-generic.c <<'END'
-const char* str (void)
-{
- return "hello-generic";
-}
+const char* str = "hello-generic";
END
cat > hello-common.c <<'END'
#include <stdio.h>
-const char* str (void);
+extern const char* str;
void print (void)
{
- puts (str ());
+ puts (str);
}
END
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index e2bf638..c0ebf9f 100755
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -68,7 +68,7 @@
XT_ACLOCAL_PATH=$XT_ACLOCAL_PATH${ACLOCAL_PATH+":$ACLOCAL_PATH"}
# Try once again to fetch the pkg-config macros.
mkdir m4
-ACLOCAL_PATH=$XT_ACLOCAL_PATH $ACLOCAL --install -I m4
+ACLOCAL_PATH=$XT_ACLOCAL_PATH $ACLOCAL -Wno-syntax --install -I m4
if test -f m4/pkg.m4 && have_pkg_config_macros; then
echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
echo "export ACLOCAL_PATH" >> get.sh
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index c26175f..f8dce2b 100755
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
@@ -1,4 +1,4 @@
- #! /bin/sh
+#! /bin/sh
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 358d068..3ddbc40 100755
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
@@ -55,13 +55,13 @@ test $st -eq 0
grep '^ DVIPS foo\.ps$' stdout
grep '^ MAKEINFO foo\.html$' stdout
# NetBSD make will print './foo.info' instead of 'foo.info'.
-$EGREP '^ MAKEINFO (|\./)foo\.info$' stdout
+$EGREP '^ MAKEINFO (\./)?foo\.info$' stdout
grep '^ TEXI2DVI foo\.dvi$' stdout
grep '^ TEXI2PDF foo\.pdf$' stdout
grep '^ DVIPS sub/zardoz.ps$' stdout
grep '^ MAKEINFO sub/zardoz.html$' stdout
# NetBSD make will print './sub/zardoz.info' instead of 'zardoz.info'.
-$EGREP '^ MAKEINFO (|\./)sub/zardoz.info$' stdout
+$EGREP '^ MAKEINFO (\./)?sub/zardoz.info$' stdout
grep '^ TEXI2DVI sub/zardoz.dvi$' stdout
grep '^ TEXI2PDF sub/zardoz.pdf$' stdout
# No make recipe is displayed before being executed.
diff --git a/t/subpkg-macrodir.sh b/t/subpkg-macrodir.sh
index a16f42b..189df06 100755
--- a/t/subpkg-macrodir.sh
+++ b/t/subpkg-macrodir.sh
@@ -38,14 +38,13 @@ AC_DEFUN([AX_FOO], [
EOF
cat > m4/bar.m4 <<'EOF'
-AC_DEFUN([AX_BAR], [AC_SUBST([WHOMAI], [SuperPkg])])
+AC_DEFUN([AX_BAR], [AC_SUBST([WHOAMI], [SuperPkg])])
EOF
cat > Makefile.am << 'END'
-test-whomai:
+test-whoami:
test '$(WHOAMI)' = SuperPkg
-check-local: test
-.PHONY: test
+check-local: test-whoami
END
mkdir pkg
@@ -60,14 +59,13 @@ END
mkdir pkg/macros
cat > pkg/macros/zardoz.m4 << 'END'
-AC_DEFUN([AX_BAR], [AC_SUBST([WHOMAI], [sub-pkg])])
+AC_DEFUN([AX_BAR], [AC_SUBST([WHOAMI], [sub-pkg])])
END
cat > pkg/Makefile.am << 'END'
-test-whomai:
+test-whoami:
test '$(WHOAMI)' = sub-pkg
-check-local: test
-.PHONY: test
+check-local: test-whomai
END
AUTOMAKE=$AUTOMAKE ACLOCAL=$ACLOCAL AUTOCONF=$AUTOCONF $AUTORECONF -vi
@@ -79,8 +77,8 @@ $FGREP 'm4_include([macros/zardoz.m4])' pkg/aclocal.m4
./configure
-$MAKE test
-(cd pkg && $MAKE test) || exit 1
+$MAKE test-whoami
+(cd pkg && $MAKE test-whoami) || exit 1
$MAKE distcheck
diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
index e232d5f..2e20322 100755
--- a/t/tags-pr12372.sh
+++ b/t/tags-pr12372.sh
@@ -23,6 +23,9 @@ required='cc etags'
cat >> configure.ac <<'END'
AC_PROG_CC
AC_CONFIG_FILES([sub/Makefile])
+# Fake linking. Help avoid possible spurious errors from make
+# or from the linker; errors that are irrelevant to this test.
+AC_SUBST([LINK], ['echo $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@'])
AC_OUTPUT
END
@@ -33,7 +36,6 @@ all-local: tags
$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
rm -f $*.c
-LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
noinst_PROGRAMS = foo
foo_SOURCES = foo-main.pc barbar.c
SUBDIRS = sub
@@ -47,7 +49,6 @@ all-local: tags
$(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
rm -f $*.c
-LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
noinst_PROGRAMS = zap
zap_SOURCES = zardoz.pc
END
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.6-230-gfb21440,
Stefano Lattarini <=