Hash :
9f7864ba
Author :
Date :
2011-10-16T14:57:37
include: avoid "deleted .am file" problem * automake.in (handle_configure): When processing `configure.am', also expand `HAVE-MAKEFILE-IN-DEPS' to a boolean telling whether `MAKEFILE-IN-DEPS' is empty or not. * lib/am/configure.am [?HAVE-MAKEFILE-IN-DEPS?] (%MAKEFILE-IN-DEPS%): New target without dependencies, to avoid the "deleted .am file" problem. Emit this only when `?HAVE-MAKEFILE-IN-DEPS?' is true, to avoid generating an "empty" dependency declaration. * tests/deleted-am.test: Make grepping of error message stricter. * tests/dist-missing-am.test: Likewise. * tests/remake-deleted-am.test: New test. * tests/remake-deleted-am-2.test: Likewise. * tests/remake-deleted-am-subdir.test: Likewise. * tests/remake-renamed-am.test: Likewise. * tests/makefile-deps.test: Likewise. * tests/Makefile.am (TESTS): Add the new tests. * NEWS: Update. Fixes automake bug#9768. Report by Peter Johansson. See also commit `Release-1-10-40-gd0ebf71', which fixed a similar problem for .m4 files included by configure.ac.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
#! /bin/sh
# Copyright (C) 2011 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/>.
# Check that inclusion of `.am' fragments by automake does not suffer
# of the "deleted header problem". Basic checks are done here.
. ./defs || Exit 1
set -e
echo AC_OUTPUT >> configure.in
$ACLOCAL
$AUTOCONF
cat > Makefile.am <<'END'
include foo.am
include $(srcdir)/bar.am
include $(top_srcdir)/baz.am
END
echo '# this is foo' > foo.am
echo '# this is bar' > bar.am
echo '# this is baz' > baz.am
$AUTOMAKE
# Sanity checks.
$FGREP 'this is foo' Makefile.in
$FGREP 'this is bar' Makefile.in
$FGREP 'this is baz' Makefile.in
./configure
$MAKE # Should be no-op.
$sleep
sed '/^include foo\.am$/d' Makefile.am > t
mv -f t Makefile.am
rm -f foo.am
$MAKE Makefile
# Sanity checks.
$FGREP 'this is foo' Makefile.in Makefile && Exit 1
$FGREP 'this is bar' Makefile.in
$FGREP 'this is bar' Makefile
$FGREP 'this is baz' Makefile.in
$FGREP 'this is baz' Makefile
$sleep
echo '# empty empty' > Makefile.am
rm -f bar.am baz.am
$MAKE Makefile
# Sanity checks.
$FGREP 'empty empty' Makefile.in
$FGREP 'empty empty' Makefile
grep 'this is ba[rz]' Makefile Makefile.in && Exit 1
: