Tag
Hash :
17820676
Author :
Date :
2003-11-22T18:05:35
Fix for PR automake/411: * automake.in (rewrite_inputs_into_dependencies): Simplify, and rename into ... (prepend_srcdir): ... this. (rewrite_inputs_into_dependencies): New function, extracted from ... (handle_configure): ... here. Adjust to use prepend_srcdir or rewrite_inputs_into_dependencies where needed. Especially, using (the new) rewrite_inputs_into_dependencies to compute Makefile dependencies will fix PR/411. * lib/am/configure.am (DIST_COMMON): Remove %MAKEFILE-IN%, it's already distributed by rewrite_inputs_into_dependencies. * tests/Makefile.am (TESTS): Add output10.test, remove distcom.test. * tests/colon3.test: Use set -e. Don't allow any AUTOMAKE invocation refer to zardoz. Make sure two.in and three.in appear as $(srcdir)/two.in and $(srcdir)/three.in dependencies. * tests/distcom.test: Delete. This is covered by tests/output9.test. * tests/output10.test: New file, for PR/411.
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
#! /bin/sh
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
# GNU Automake 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.
#
# GNU Automake 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 Automake; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# Make sure ":" works with files automake generates.
# This test is for multiple ":"s.
. ./defs || exit 1
set -e
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AC_OUTPUT(Makefile:zardoz.in:two.in:three.in)
END
: > zardoz.am
: > two.in
: > three.in
$ACLOCAL
$AUTOMAKE
# We actually check several things here.
# Automake should have created zardoz.in.
test -f zardoz.in
# The generated file should refer to zardoz.in and zardoz.am, but
# never just "zardoz".
echo Grep1
grep zardoz zardoz.in | $EGREP -v 'zardoz.in' | $FGREP -v 'zardoz.am' > O || :
# We cat the output file so we see in when verbose.
cat O
test -z "`cat O`"
# Makefile should depend on two.in.
echo Grep2
grep '^Makefile:.* \$(srcdir)/two.in' zardoz.in
# Likewise three.in.
echo Grep3
grep '^Makefile:.* \$(srcdir)/three.in' zardoz.in