Hash :
880595d0
Author :
Date :
2012-08-22T16:40:15
compile: remove support for $(INCLUDES) It has already been deprecated in the manual and by warnings in the 'obsolete' category for ages (at least since 2003), in favour of AM_CPPFLAGS. Automake-NG has removed support for it already. And the warnings in the obsolete category are on by default since the 1.12.4 release. So, by removing it in Automake 1.14, we will simplify the transition path for people that want to switch to Automake-NG. See also Automake-NG commit v1.12-267-g6b74968 of 2012-05-21, "[ng] compile: don't support $(INCLUDES) anymore, it's obsolete". * NEWS, doc/automake.texi: Update. * automake.in (generate_makefile): Reject INCLUDES unconditionally. In all languages: don't add $(INCLUDES) to the compiler command line. * t/includes-deprecation.sh: New test. * t/list-of-tests.mk: Add it. * t/werror2.sh : Adjust to avoid spurious failures. * t/pluseq5.sh: Likewise. * t/warnopts.sh: Likewise. Suggested-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
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
#! /bin/sh
# Copyright (C) 1999-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/>.
# Test for another '+=' problem. Report from Brian Jones.
. test-init.sh
cat >> configure.ac << 'END'
AM_CONDITIONAL([CHECK], [true])
END
cat > Makefile.am << 'END'
if CHECK
AM_CPPFLAGS = abc
endif
AM_CPPFLAGS += def
END
$ACLOCAL
AUTOMAKE_fails
# We expect the following diagnostic:
#
# Makefile.am:4: cannot apply '+=' because 'AM_CPPFLAGS' is not defined in
# Makefile.am:4: the following conditions:
# Makefile.am:4: !CHECK
# Makefile.am:4: either define 'AM_CPPFLAGS' in these conditions, or use
# Makefile.am:4: '+=' in the same conditions as the definitions.
# Is !CHECK mentioned?
grep ':.*!CHECK$' stderr
# Is there only one missing condition?
test $(grep -c ': ' stderr) -eq 1
: