From 1faeb56a0bca56baee3c78860e7489dba492f339 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 10 Mar 2006 12:02:26 +0000 Subject: [PATCH] * automake.in (lang_c_rewrite): Typo in previous change. * tests/ccnoco2.test: New file. * tests/Makefile.am (TESTS): Add ccnoco2.test. --- ChangeLog | 4 ++++ automake.in | 2 +- tests/Makefile.am | 1 + tests/Makefile.in | 32 ++++++++++++------------- tests/ccnoco2.test | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 17 deletions(-) create mode 100755 tests/ccnoco2.test diff --git a/ChangeLog b/ChangeLog index c2cf206f8..9e368b160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-03-10 Alexandre Duret-Lutz + * automake.in (lang_c_rewrite): Typo in previous change. + * tests/ccnoco2.test: New file. + * tests/Makefile.am (TESTS): Add ccnoco2.test. + * automake.in (lang_c_rewrite): Make the AM_PROG_CC_C_O requirement a 'portability' warning, so that people can ignore it. Suggested by Ralf Wildenhues. diff --git a/automake.in b/automake.in index 174eb6744..315806310 100755 --- a/automake.in +++ b/automake.in @@ -5242,7 +5242,7 @@ sub lang_c_rewrite # libtool is always able to put the object at the proper place, # so we do not have to require AM_PROG_CC_C_O when building .lo files. - msg_var ('portabiliy', $var, + msg_var ('portability', $var, "compiling `$base.c' in subdir requires " . "`AM_PROG_CC_C_O' in `$configure_ac'", uniq_scope => US_GLOBAL, diff --git a/tests/Makefile.am b/tests/Makefile.am index b08e6a872..896bae154 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -74,6 +74,7 @@ canon3.test \ canon4.test \ canon5.test \ ccnoco.test \ +ccnoco2.test \ check.test \ check2.test \ check3.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 7f1b877c4..3b3e9f795 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -45,22 +45,22 @@ TESTS = aclibobj.test aclocal.test aclocal3.test aclocal4.test \ auxdir.test auxdir2.test auxdir3.test auxdir4.test backsl.test \ backsl2.test backsl3.test backsl4.test badline.test \ badprog.test block.test bsource.test canon.test canon2.test \ - canon3.test canon4.test canon5.test ccnoco.test check.test \ - check2.test check3.test check4.test check5.test checkall.test \ - clean.test clean2.test colneq.test colneq2.test colon.test \ - colon2.test colon3.test colon4.test colon5.test colon6.test \ - colon7.test comment.test comment2.test comment3.test \ - comment4.test comment5.test comment6.test comment7.test \ - comment8.test comment9.test commen10.test compile.test \ - compile_f90_c_cxx.test compile_f_c_cxx.test cond.test \ - cond2.test cond3.test cond4.test cond5.test cond6.test \ - cond7.test cond8.test cond9.test cond10.test cond11.test \ - cond13.test cond14.test cond15.test cond16.test cond17.test \ - cond18.test cond19.test cond20.test cond21.test cond22.test \ - cond23.test cond24.test cond25.test cond26.test cond27.test \ - cond28.test cond29.test cond30.test cond31.test cond32.test \ - cond33.test cond34.test cond35.test cond36.test cond37.test \ - cond38.test condd.test condhook.test condinc.test \ + canon3.test canon4.test canon5.test ccnoco.test ccnoco2.test \ + check.test check2.test check3.test check4.test check5.test \ + checkall.test clean.test clean2.test colneq.test colneq2.test \ + colon.test colon2.test colon3.test colon4.test colon5.test \ + colon6.test colon7.test comment.test comment2.test \ + comment3.test comment4.test comment5.test comment6.test \ + comment7.test comment8.test comment9.test commen10.test \ + compile.test compile_f90_c_cxx.test compile_f_c_cxx.test \ + cond.test cond2.test cond3.test cond4.test cond5.test \ + cond6.test cond7.test cond8.test cond9.test cond10.test \ + cond11.test cond13.test cond14.test cond15.test cond16.test \ + cond17.test cond18.test cond19.test cond20.test cond21.test \ + cond22.test cond23.test cond24.test cond25.test cond26.test \ + cond27.test cond28.test cond29.test cond30.test cond31.test \ + cond32.test cond33.test cond34.test cond35.test cond36.test \ + cond37.test cond38.test condd.test condhook.test condinc.test \ condinc2.test condlib.test condman.test condman2.test \ conf2.test confdeps.test conff.test conff2.test confh.test \ confh4.test confh5.test config.test confincl.test conflnk.test \ diff --git a/tests/ccnoco2.test b/tests/ccnoco2.test new file mode 100755 index 000000000..accb7c2b1 --- /dev/null +++ b/tests/ccnoco2.test @@ -0,0 +1,59 @@ +#! /bin/sh +# Copyright (C) 2006 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., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +# Make sure Automake requires AM_PROG_CC_C_O when either per-targets +# flags or subdir-objects are used. + +. ./defs || exit 1 + +set -e + +cat >>configure.in <Makefile.am <Makefile.am <> Makefile.am +AUTOMAKE_fails --copy --add-missing +grep 'Makefile.am:2:.*subdir.*AM_PROG_CC_C_O' stderr -- 2.47.2