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 60 61 62 63 64 65 66 67
#! /bin/sh
# Copyright (C) 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 an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
# This is comparable to output9.test, but testing Makefile rules.
# PR/411
. ./defs || exit 1
set -e
cat >> configure.in << END
AC_SUBST([FOO], [top])
AC_SUBST([BAR], [bot])
AC_CONFIG_FILES([a/top])
AC_CONFIG_FILES([a/bot])
AC_CONFIG_FILES([b/Makefile:a/top:b/Makefile.in:a/bot])
AC_OUTPUT
END
mkdir a
mkdir b
cat >Makefile.am <<\EOF
SUBDIRS = b
dist-hook:
test ! -f $(distdir)/a/top
test ! -f $(distdir)/a/bot
EOF
cat >b/Makefile.am <<\EOF
output:
echo $(TOP)$(BOT) > ok
EOF
echo TOP=@FOO@ >a/top.in
echo BOT=@BAR@ >a/bot.in
$ACLOCAL
$AUTOCONF
$AUTOMAKE
mkdir build
cd build
../configure
cd b
$MAKE output
grep topbot ok
cd ..
$MAKE distcheck