[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.2-98-gca2f878 |
|
Date: |
Sun, 15 Jan 2012 16:30:18 +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=ca2f878ef53c25f2d49df9db7e599f9e681117fb
The branch, branch-1.11 has been updated
via ca2f878ef53c25f2d49df9db7e599f9e681117fb (commit)
via 05c02989174d490b842c46cb8f25fb8b601a7c4f (commit)
via def0340b7e8ae999eafe4466fc934e7694fe372d (commit)
via 59367c05bbfd19062c6754f088d16bec33f39b54 (commit)
via 0188e0f50e4b9802f50ccaa11390a364db7354a6 (commit)
via 4013982ecfc418f588d6c423c61600d49ad9d3f4 (commit)
via 539cae3bb691b4cef90e3c1fdbce833093ed6203 (commit)
via dfb5e52f5f52fda733f1a6d27680fc347ba17286 (commit)
via f1df5481b9a51023b46390d7730c3a401a00e9fd (commit)
via 657eed2e1b1f2e0fac19f4c840b72a71ec6e1141 (commit)
from 395086602f44cf6804f3c7c7f990c18a274bca5b (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 ca2f878ef53c25f2d49df9db7e599f9e681117fb
Merge: 3950866 05c0298
Author: Stefano Lattarini <address@hidden>
Date: Sun Jan 15 17:21:39 2012 +0100
Merge branch 'maint' into branch-1.11
* maint:
gnupload: moved to gnulib
sync: gitlog-to-changelog from gnulib upstream
test defs: backport optimized 'using_gmake' implementation
tests: unify some tests on "make -n", reducing duplication
vala: use "$(am__cd) $(srcdir)", not "cd $(srcdir)"
dist: avoid $(distdir) removal failure on MSYS/MinGW
tests: fix spurious failure of 'get-sysconf.test'
coverage: expose automake bug#10470 (distcheck-related)
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +
NEWS | 3 +
automake.in | 2 +-
lib/am/distdir.am | 17 +++-
lib/gitlog-to-changelog | 6 +-
lib/gnupload | 28 ++++----
tests/Makefile.am | 3 +-
tests/defs.in | 25 +++++-
tests/distcheck-pr10470.test | 61 +++++++++++++++
tests/get-sysconf.test | 14 +++-
tests/maken.test | 9 ++-
tests/maken2.test | 63 ---------------
tests/maken3.test | 24 +++++-
tests/maken4.test | 172 ------------------------------------------
14 files changed, 156 insertions(+), 273 deletions(-)
create mode 100755 tests/distcheck-pr10470.test
delete mode 100755 tests/maken2.test
delete mode 100755 tests/maken4.test
diff --git a/Makefile.am b/Makefile.am
index 8fe9c0f..ae07898 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -729,6 +729,7 @@ INSTALL \
config-ml.in \
config.guess \
config.sub \
+gnupload \
gitlog-to-changelog \
symlink-tree \
texinfo.tex
@@ -743,6 +744,7 @@ fetch:
$(WGET_SV_GIT_CF)config.sub -O config.sub && \
$(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
$(WGET_SV_GIT_GL)doc/INSTALL -O INSTALL && \
+ $(WGET_SV_GIT_GL)build-aux/gnupload -O gnupload && \
$(WGET_SV_GIT_GL)build-aux/gitlog-to-changelog -O gitlog-to-changelog
&& \
$(WGET_GCC)config-ml.in -O config-ml.in && \
$(WGET_GCC)symlink-tree -O symlink-tree)
diff --git a/NEWS b/NEWS
index dfba28f..a0a65f9 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,9 @@ New in 1.11.2a:
* Miscellaneous changes:
+ - The master copy of the `gnupload' script is now maintained in gnulib,
+ not in automake.
+
- The `missing' script don't try to wrap calls to `tar' anymore.
- "make dist" doesn't wrap `tar' invocations with the `missing' script
diff --git a/automake.in b/automake.in
index 6e3754e..bc62e8c 100644
--- a/automake.in
+++ b/automake.in
@@ -6099,7 +6099,7 @@ sub lang_vala_finish_target ($$)
$output_rules .=
"\$(srcdir)/${derived}_vala.stamp: \$(${derived}_SOURCES)\n".
- "\t${verbose}cd \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
+ "\t${verbose}\$(am__cd) \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
"\t${silent}touch address@hidden";
push_dist_common ("${derived}_vala.stamp");
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index a681101..cd2e4bf 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-## 2010, 2011 Free Software Foundation, Inc.
+## 2010, 2011, 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
@@ -23,10 +23,17 @@ distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
-
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+## On MSYS (1.0.17) it is not possible to remove a directory that is in
+## use; so, if the first rm fails, we sleep some seconds and retry, to
+## give pending processes some time to exit and "release" the directory
+## before we remove it. The value of "some seconds" is 5 for the moment,
+## which is mostly an arbitrary value, but seems high enough in practice.
+## See automake bug#10470.
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
endif %?TOPDIR_P%
if %?SUBDIRS%
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 9d5327a..0efedb0 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
if 0;
# Convert git log output to ChangeLog format.
-my $VERSION = '2012-01-02 14:48'; # UTC
+my $VERSION = '2012-01-06 07:14'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -47,7 +47,7 @@ sub usage ($)
my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
if ($exit_code != 0)
{
- print $STREAM "Try `$ME --help' for more information.\n";
+ print $STREAM "Try '$ME --help' for more information.\n";
}
else
{
@@ -211,7 +211,7 @@ sub parse_amend_file($)
my @cmd = (qw (git log --log-size),
'--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV);
open PIPE, '-|', @cmd
- or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+ or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"
. "(Is your Git too old? Version 1.5.1 or later is required.)\n");
my $prev_multi_paragraph;
diff --git a/lib/gnupload b/lib/gnupload
index 5036752..51e17c6 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,10 +1,9 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2010-05-23.15; # UTC
+scriptversion=2012-01-15.15; # UTC
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004-2010, 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
@@ -20,6 +19,8 @@ scriptversion=2010-05-23.15; # UTC
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Originally written by Alexandre Duret-Lutz <address@hidden>.
+# The master copy of this file is maintained in the gnulib Git repository.
+# Please send bug reports and feature requests to address@hidden
set -e
@@ -57,7 +58,7 @@ Options:
--version output version information and exit
If --symlink-regex is given without EXPR, then the link target name
-is created by replacing the version information with \`-latest', e.g.:
+is created by replacing the version information with '-latest', e.g.:
foo-1.3.4.tar.gz -> foo-latest.tar.gz
@@ -105,8 +106,7 @@ happen to have an ncftp package installed, the ncftpput-ftp
script in
the build-aux/ directory of the gnulib package
(http://savannah.gnu.org/projects/gnulib) may serve as a replacement.
-Report bugs to <address@hidden>.
-Send patches to <address@hidden>."
+Send patches and bug reports to <address@hidden>."
# Read local configuration file
if test -r "$conffile"; then
@@ -170,7 +170,7 @@ while test -n "$1"; do
break
;;
-*)
- echo "$0: Unknown option \`$1', try \`$0 --help'" 1>&2
+ echo "$0: Unknown option '$1', try '$0 --help'" 1>&2
exit 1
;;
esac
@@ -188,7 +188,7 @@ done
dprint()
{
- echo "Running $*..."
+ echo "Running $* ..."
}
if $dry_run; then
@@ -219,7 +219,7 @@ else
for file
do
if test ! -f $file; then
- echo "$0: Cannot find \`$file'" 1>&2
+ echo "$0: Cannot find '$file'" 1>&2
exit 1
elif test -n "$symlink_expr"; then
linkname=`echo $file | sed "$symlink_expr"`
@@ -238,10 +238,10 @@ fi
unset passphrase
# Reset PATH to be sure that echo is a built-in. We will later use
-# `echo $passphrase' to output the passphrase, so it is important that
-# it is a built-in (third-party programs tend to appear in `ps'
+# 'echo $passphrase' to output the passphrase, so it is important that
+# it is a built-in (third-party programs tend to appear in 'ps'
# listings with their arguments...).
-# Remember this script runs with `set -e', so if echo is not built-in
+# Remember this script runs with 'set -e', so if echo is not built-in
# it will exit now.
PATH=/empty echo -n "Enter GPG passphrase: "
stty -echo
@@ -252,7 +252,7 @@ echo
if test $# -ne 0; then
for file
do
- echo "Signing $file..."
+ echo "Signing $file ..."
rm -f $file.sig
echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
done
@@ -391,7 +391,7 @@ for dest in $to
do
for file
do
- echo "Uploading $file to $dest..."
+ echo "Uploading $file to $dest ..."
stmt=
files="$file $file.sig"
destdir=`echo $dest | sed 's/[^:]*://'`
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ed6e154..21b844b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -368,6 +368,7 @@ distcheck-hook2.test \
distcheck-missing-m4.test \
distcheck-outdated-m4.test \
distcheck-pr9579.test \
+distcheck-pr10470.test \
distcheck-override-infodir.test \
dmalloc.test \
doc-parsing-buglets-colneq-subst.test \
@@ -583,9 +584,7 @@ makefile-deps.test \
makej.test \
makej2.test \
maken.test \
-maken2.test \
maken3.test \
-maken4.test \
makevars.test \
man.test \
man2.test \
diff --git a/tests/defs.in b/tests/defs.in
index 457c04e..7cedaa0 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -516,13 +516,30 @@ is_newest ()
# using_gmake
# -----------
# Return success if $MAKE is GNU make, return failure otherwise.
+# Caches the result for speed reasons.
using_gmake ()
{
- # Use --version AND -v, because SGI Make doesn't fail on --version.
- # Also grep for GNU because newer versions of FreeBSD make do
- # not complain about `--version' (they seem to silently ignore it).
- $MAKE --version -v | grep GNU
+ case $am__using_gmake in
+ yes)
+ return 0;;
+ no)
+ return 1;;
+ '')
+ # Use --version AND -v, because SGI Make doesn't fail on --version.
+ # Also grep for GNU because newer versions of FreeBSD make do
+ # not complain about `--version' (they seem to silently ignore it).
+ if $MAKE --version -v | grep GNU; then
+ am__using_gmake=yes
+ return 0
+ else
+ am__using_gmake=no
+ return 1
+ fi;;
+ *)
+ fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";;
+ esac
}
+am__using_gmake="" # Avoid interferences from the environment.
# AUTOMAKE_run status [options...]
# --------------------------------
diff --git a/tests/distcheck-pr10470.test b/tests/distcheck-pr10470.test
new file mode 100755
index 0000000..e774dd7
--- /dev/null
+++ b/tests/distcheck-pr10470.test
@@ -0,0 +1,61 @@
+#! /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/>.
+
+# Ensure "make distcheck" does not experience racy failures on
+# systems (like MinGW/MSYS) that cannot remove a directory "in use"
+# by a process (e.g., that is its "current working directory").
+# See automake bug#10470.
+
+parallel_tests=no
+. ./defs || Exit 1
+
+set -e
+
+mkdir foo.d
+sh -c "cd foo.d && sleep '4'" &
+# Without this sleep, the "rm -rf foo.d" below would reliably beat
+# the "cd foo.d" in the subshell above, and the test would be always
+# skipped, even on MinGW/MSYS.
+sleep '1'
+rm -rf foo.d && skip_ 'system is able to remove "in use" directories'
+
+echo AC_OUTPUT >> configure.in
+
+cat > Makefile.am <<END
+TESTS = foo.test
+EXTRA_DIST= foo.test
+END
+
+cat > foo.test <<END
+#!/bin/sh
+sleep '4' &
+exit 0
+END
+chmod a+x foo.test
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+# We can build the distribution.
+$MAKE distcheck >output 2>&1 || { cat output; Exit 1; }
+cat output
+# Sanity check: verify that our code has hit a problem removing
+# the distdir, but has recovered from it.
+grep "rm:.*$destdir" output || fatal_ "expected code path not covered"
+
+:
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index 1a549a3..bad4735 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -30,7 +30,19 @@ testbuilddir=`(cd .. && pwd)`
top_testbuilddir=`(cd $testbuilddir/.. && pwd)`
st=0
-sed 20q "$top_testsrcdir/ChangeLog" || st=1
+if test -d "$top_testsrcdir"/.git; then
+ # We are running from a git checkout.
+ git log -1 || st=1
+else
+ # We are probably running from a distribution tarball, so
+ # the ChangeLog file must be present.
+ awk '
+ BEGIN { first = 1 }
+ (first == 1) { print; first = 0; next; }
+ /^[^\t]/ { exit(0); }
+ { print }
+ ' "$top_testsrcdir"/ChangeLog || st=1
+fi
$PERL -V || st=1
cat "$top_testbuilddir/config.log" || st=1
cat "$testbuilddir/aclocal-$APIVERSION" || st=1
diff --git a/tests/maken.test b/tests/maken.test
index 8c78b97..61f6886 100755
--- a/tests/maken.test
+++ b/tests/maken.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -16,8 +16,8 @@
# Ensure that `make -n dist' and `make -n distcheck' do not change files
# on disk, due to GNU make executing rules containing `$(MAKE)'.
-
-# Please keep this test in sync with sister test maken2.test.
+# Also, ensure that `make -n dist' and `make -n distcheck' show what
+# would happen, at least when using GNU make.
. ./defs || Exit 1
@@ -54,6 +54,9 @@ echo stamp > stampfile
$sleep
for target in dist distcheck; do
$MAKE -n $target
+ if using_gmake; then
+ $MAKE -n $target | grep stamp-sub-dist-hook || Exit 1
+ fi
$MAKE test-no-distdir
test `ls -1t | sed 1q` = stampfile
done
diff --git a/tests/maken2.test b/tests/maken2.test
deleted file mode 100755
index 97bf798..0000000
--- a/tests/maken2.test
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009 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/>.
-
-# Ensure that `make -n dist' and `make -n distcheck' show what would happen.
-# This currently works for GNU make only.
-
-# Please keep this test in sync with sister test maken.test.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-distcheck-hook:
- @: > stamp-distcheck-hook
-test-no-distdir:
- test ! -d $(distdir)
- test ! -f stamp-distcheck-hook
- test ! -f sub/stamp-sub-dist-hook
-END
-cat >sub/Makefile.am <<'END'
-dist-hook:
- @: > stamp-sub-dist-hook
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-./configure
-
-$sleep
-echo stamp > stampfile
-$sleep
-for target in dist distcheck; do
- $MAKE -n $target
- $MAKE test-no-distdir
- $MAKE -n $target | grep stamp-sub-dist-hook
- test `ls -1t | sed 1q` = stampfile
-done
-
-Exit 0
diff --git a/tests/maken3.test b/tests/maken3.test
index b839d0d..27494cc 100755
--- a/tests/maken3.test
+++ b/tests/maken3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -14,14 +14,19 @@
# 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 `make -n' for various targets, to ensure that no files or
-# directories are created.
+# Test `make -n' for various targets, to ensure that:
+#
+# 1. no files or directories are created or removed, and
+#
+# 2. if using GNU make, stdout output is sufficiently complete.
+#
+# FIXME: The checks in (2) should also work with BSD make implementations
+# FIXME: that support the `.MAKE' special target, but currently we don't
+# FIXME: explicitly test that this is truly the case.
#
# This test exercises the GCS-mandated targets (except for dist)
# as well as tags, TAGS.
-# Please keep this test in sync with sister test maken4.test.
-
. ./defs || Exit 1
set -e
@@ -134,18 +139,27 @@ check_targets ()
case $target in
install-* | installdirs | tags | TAGS ) ;;
*)
+ if using_gmake; then
+ grep "stamp-$target$" stdout || Exit 1
+ fi
test ! -f "stamp-$target$" || Exit 1
;;
esac
case $target in
install-* | installdirs ) ;;
*)
+ if using_gmake; then
+ grep "stamp-$target-sub" stdout || Exit 1
+ fi
test ! -f "sub/stamp-$target-sub" || Exit 1
;;
esac
case $target in
distclean | maintainer-clean ) ;;
*)
+ if using_gmake; then
+ grep "should-not-be-executed" stdout || Exit 1
+ fi
test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1
;;
esac
diff --git a/tests/maken4.test b/tests/maken4.test
deleted file mode 100755
index ae5ce27..0000000
--- a/tests/maken4.test
+++ /dev/null
@@ -1,172 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009 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/>.
-
-# Test `make -n' for various targets, to ensure that stdout output is
-# sufficiently complete. This currently only works for GNU make and
-# BSD make implementations that support the `.MAKE' special target.
-#
-# This test exercises the GCS-mandated targets (except for dist)
-# as well as tags, TAGS.
-
-# Please keep this test in sync with sister test maken3.test.
-
-required=GNUmake
-. ./defs || Exit 1
-
-set -e
-
-mkdir sub sub2
-
-cat >> configure.in << 'END'
-AC_CONFIG_FILES([sub/Makefile sub2/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = foo.test
-SUBDIRS = sub sub2
-##BUILT_SOURCES = foo
-foo:
-foo.test:
-all-local:
- @: > stamp-all
-install-data-local:
- @: > stamp-install
-uninstall-local:
- @: > stamp-uninstall
-clean-local:
- @: > stamp-clean
-distclean-local:
- @: > stamp-distclean
-info-local:
- @: > stamp-info
-html-local:
- @: > stamp-html
-dvi-local:
- @: > stamp-dvi
-ps-local:
- @: > stamp-ps
-pdf-local:
- @: > stamp-pdf
-check-local:
- @: > stamp-check
-installcheck-local:
- @: > stamp-installcheck
-mostlyclean-local:
- @: > stamp-mostlyclean
-maintainer-clean-local:
- @: > stamp-maintainer-clean
-END
-cat >sub/Makefile.am <<'END'
-all-local:
- @: > stamp-all-sub
-install-data-local:
- @: > stamp-install-sub
-uninstall-local:
- @: > stamp-uninstall-sub
-clean-local:
- @: > stamp-clean-sub
-distclean-local:
- @: > stamp-distclean-sub
-info-local:
- @: > stamp-info-sub
-html-local:
- @: > stamp-html-sub
-dvi-local:
- @: > stamp-dvi-sub
-ps-local:
- @: > stamp-ps-sub
-pdf-local:
- @: > stamp-pdf-sub
-check-local:
- @: > stamp-check-sub
-installcheck-local:
- @: > stamp-installcheck-sub
-tags:
- @: > stamp-tags-sub
-TAGS:
- @: > stamp-TAGS-sub
-mostlyclean-local:
- @: > stamp-mostlyclean-sub
-maintainer-clean-local:
- @: > stamp-maintainer-clean-sub
-END
-cat >sub2/Makefile.am <<'END'
-all install uninstall clean check:
- @: > address@hidden
-info dvi pdf ps:
- @: > address@hidden
-html:
- @: > address@hidden
-install-info install-html install-dvi install-pdf install-ps:
- @: > address@hidden
-installcheck installdirs tags TAGS mostlyclean:
- @: > address@hidden
-## These targets cannot be overridden like this:
-## install-strip distclean maintainer-clean
-END
-
-$ACLOCAL
-$AUTOCONF
-
-check_targets ()
-{
- set -e
- for target in \
- all install install-strip uninstall clean distclean check \
- info html dvi pdf ps \
- install-info install-html install-dvi install-pdf install-ps \
- installcheck installdirs tags TAGS mostlyclean maintainer-clean
- do
- $MAKE -n $target >stdout || { cat stdout; Exit 1; }
- cat stdout
- case $target in
- install-* | installdirs | tags | TAGS ) ;;
- *)
- grep "stamp-$target$" stdout || Exit 1
- test ! -f "stamp-$target$" || Exit 1
- ;;
- esac
- case $target in
- install-* | installdirs ) ;;
- *)
- grep "stamp-$target-sub" stdout || Exit 1
- test ! -f "sub/stamp-$target-sub" || Exit 1
- ;;
- esac
- case $target in
- distclean | maintainer-clean ) ;;
- *)
- grep "should-not-be-executed" stdout || Exit 1
- test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1
- ;;
- esac
- done
-}
-
-$AUTOMAKE -Wno-override
-./configure
-check_targets || Exit 1
-
-# Now, introduce BUILT_SOURCES into the toplevel Makefile
-# TODO: add BUILT_SOURCES to sub2, fix fallout.
-sed 's/##//' < Makefile.am > t
-mv -f t Makefile.am
-$AUTOMAKE -Wno-override --force Makefile
-./configure
-check_targets || Exit 1
-
-Exit 0
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.2-98-gca2f878,
Stefano Lattarini <=