* automake.in (lang_c_rewrite): Typo in previous change.

* tests/ccnoco2.test: New file.
* tests/Makefile.am (TESTS): Add ccnoco2.test.

diff --git a/ChangeLog b/ChangeLog
index c2cf206f8c0cae06735710de0a9ab84b5c00640b..9e368b16012afbc9aee2a1855e9d6a3dbdaf771d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-03-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * 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 174eb674432dff6a9c237a792dfbbd6012213a06..3158063107bed513e78f802a2545495fa13ab139 100755 (executable)
--- 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 b08e6a872eafa6d4c4be172ef0334cb64ed7e2df..896bae1546570d3b93aaed073fce32c724380e1f 100644 (file)
--- 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 7f1b877c41db6867b873bde1b9073b41bc60a161..3b3e9f795375f68b85a627b9cce587165ee95de0 100644 (file)
--- 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 (executable)
index 0000000..accb7c2
--- /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 <<EOF
+AC_PROG_CC
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
+wish_CPPFLAGS = -DWHATEVER
+EOF
+
+touch a.c
+
+$ACLOCAL
+$AUTOCONF
+AUTOMAKE_fails --copy --add-missing
+grep 'Makefile.am:2:.*per-target.*AM_PROG_CC_C_O' stderr
+
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = wish
+wish_SOURCES = sub/a.c
+EOF
+
+mkdir sub
+mv a.c sub
+
+$AUTOMAKE --copy --add-missing
+
+echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
+AUTOMAKE_fails --copy --add-missing
+grep 'Makefile.am:2:.*subdir.*AM_PROG_CC_C_O' stderr