Hash :
199b9086
Author :
Date :
2011-09-01T11:02:04
automake: fix regression due to de-ansification support removal The last change `v1.11-947-g136b489' removed code that automake was using to decide whether binary objects were built by the generated Makefile.in, so that it could avoid to emit unneeded code when this was not the case. Re-introduce such code in a less-obfuscated form, and add a test to ensure we don't regress again. * automake.in ($must_handle_compiled_objects): New global variable, telling whether the generated Makefile has to build compiled objects. (initialize_per_input): Reset it. (handle_programs, handle_libraries, handle_ltlibraries): Set it to a true value when required. (handle_compile): Don't generate any code if the variable `$must_handle_compiled_objects' is not set to a true value. * tests/no-extra-makefile-code.test: New test. * tests/Makefile.am (TESTS): Add it.
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
#!/bin/sh
# Copyright (C) 1996, 2000, 2001, 2002, 2010, 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 we don't emit harmless but useless code in the generated
# Makefile.in when the project does not use compiled languages. Motivated
# by a regression caused by removal of automatic de-ANSI-fication support:
# <http://lists.gnu.org/archive/html/automake-patches/2011-08/msg00200.html>
. ./defs || Exit 1
echo AC_OUTPUT >> configure.in
: > Makefile.am
rm -f depcomp compile
$ACLOCAL
$AUTOMAKE
$EGREP 'DEFAULT_INCLUDES|@am__isrc@|-compile|\$\(OBJEXT\)|tab\.[ch]' \
Makefile.in && Exit 1
: