From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 1 Dec 2002 18:16:33 +0000 (+0000)
Subject: * automake.in (lang_c_finish): Do not fill de_ansi_files
X-Git-Tag: Release-1-7b~348
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=9e13ef63009a34e49e31bfaad6291071821ea8c4;p=automake.git

* automake.in (lang_c_finish): Do not fill de_ansi_files
with subdirectory informations for %libsources files.
This revers part of a change from 2002-01-13.
* tests/ansi10.test: New file.
* tests/Makefile.am (TESTS): Add ansi10.test.
---

diff --git a/ChangeLog b/ChangeLog
index ee6050a1..2fcb0d1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-12-01  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* automake.in (lang_c_finish): Do not fill de_ansi_files
+	with subdirectory informations for %libsources files.
+	This revers part of a change from 2002-01-13.
+	* tests/ansi10.test: New file.
+	* tests/Makefile.am (TESTS): Add ansi10.test.
+
 	* automake.in (do_check_merge_target): Add missing space.
 
 	* lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
diff --git a/automake.in b/automake.in
index fcb8fc6c..7f3efc48 100755
--- a/automake.in
+++ b/automake.in
@@ -5672,9 +5672,7 @@ sub lang_c_finish
     {
 	if ($file =~ /^(.*)\.[cly]$/ && -f "$relative_dir/$file")
 	{
-	    $de_ansi_files{$1} = (($relative_dir eq '.' || $relative_dir eq '')
-				  ? ''
-				  : "$relative_dir/");
+	    $de_ansi_files{$1} = ''
 	}
     }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 19b6c491..afa1c802 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,7 @@ ansi6.test \
 ansi7.test \
 ansi8.test \
 ansi9.test \
+ansi10.test \
 ar.test \
 asm.test \
 autoheader.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b2cc9fed..3144f2ca 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -124,6 +124,7 @@ ansi6.test \
 ansi7.test \
 ansi8.test \
 ansi9.test \
+ansi10.test \
 ar.test \
 asm.test \
 autoheader.test \
diff --git a/tests/ansi10.test b/tests/ansi10.test
new file mode 100755
index 00000000..6d662e49
--- /dev/null
+++ b/tests/ansi10.test
@@ -0,0 +1,74 @@
+#! /bin/sh
+# Copyright (C) 2002  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 autoconf; 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 ansi2knr works with $(LIBOBJS).
+
+required=gcc
+. ./defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_C_PROTOTYPES
+AC_PROG_RANLIB
+AC_LIBOBJ([hello])
+AC_CONFIG_FILES([dir/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = dir
+END
+
+mkdir dir
+
+cat > dir/Makefile.am << 'END'
+AUTOMAKE_OPTIONS = ansi2knr
+noinst_LIBRARIES = liblib.a
+liblib_a_SOURCES =
+liblib_a_LIBADD = $(LIBOBJS)
+END
+
+cat > dir/hello.c << 'END'
+#include <stdio.h>
+
+int
+main (int argc, char **argv)
+{
+   printf ("hello\n");
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure am_cv_prog_cc_stdc=no
+$MAKE
+test -f dir/hello_.c
+$MAKE distclean
+test ! -f dir/hello_.c
+
+# Also run without forcing ansi2knr, so we make sure the
+# rules work with ANSI compilers.
+./configure
+$MAKE
+test ! -f dir/hello_.c