made cxxnoc.test pass again

diff --git a/ChangeLog b/ChangeLog
index 47e62fb217ffb26f48001db463c291a9b32b4b50..7feeb9d539b2dee6f8a3d334dde02609df4a9f39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 12 19:45:16 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_single_transform_list): Don't set
+       seen_any_source if all sources are C++.
+
 Wed Feb 11 17:30:01 1998  Tom Tromey  <tromey@cygnus.com>
 
        * aclocal.in (write_aclocal): Write to $output_file, not

diff --git a/automake.in b/automake.in
index fd661217b76f1a04e7247c822414068b5f2a124a..1b54e8774bfaf301246c90e231bec1f22d067d41 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1134,12 +1134,14 @@ sub handle_single_transform_list
            # Strip any directory prefix.
            $_ = &basename ($_);
 
+           local ($is_cxx) = 0;
            # Transform source files into .o files.  List of C++
            # extensions comes from Emacs 19.34 etags.
            if (s/\.(c\+\+|cc|cpp|cxx|C)$/$nonansi_obj/)
            {
                $cxx_extensions{'.' . $1} = 1;
                $linker = 'CXXLINK';
+               $is_cxx = 1;
            }
            elsif (s/\.(yy|y\+\+|yxx|ll|l\+\+|lxx)$/$nonansi_obj/)
            {
@@ -1186,7 +1188,7 @@ sub handle_single_transform_list
                next;
            }
 
-           $seen_any_source = 1;
+           $seen_any_source = 1 unless $is_cxx;
            push (@result, $_);
 
            # Transform .o or $o file into .P file (for automatic

diff --git a/depend.am b/depend.am
index 338f41e77af2cedf49afb19f2d8098179ee37cb7..3d19cb7aea7b92d99de327227d2ff5b3066e9731 100644 (file)
--- a/depend.am
+++ b/depend.am
@@ -26,8 +26,8 @@
 MKDEP = $(CC) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
 ## We must create the .deps directory if it doesn't exist.  We do it
-## in this strange way a buglet in make -- it won't try to create
-## .deps/.P if the .deps directory doesn't exist.
+## in this strange way because of a buglet in make -- it won't try to
+## create .deps/.P if the .deps directory doesn't exist.
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 ## We use ".P" as the name of our placeholder because it can't be
 ## duplicated by any C source file.  (Well, there could be ".c", but

diff --git a/lib/am/depend.am b/lib/am/depend.am
index 338f41e77af2cedf49afb19f2d8098179ee37cb7..3d19cb7aea7b92d99de327227d2ff5b3066e9731 100644 (file)
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -26,8 +26,8 @@
 MKDEP = $(CC) -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
 ## We must create the .deps directory if it doesn't exist.  We do it
-## in this strange way a buglet in make -- it won't try to create
-## .deps/.P if the .deps directory doesn't exist.
+## in this strange way because of a buglet in make -- it won't try to
+## create .deps/.P if the .deps directory doesn't exist.
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 ## We use ".P" as the name of our placeholder because it can't be
 ## duplicated by any C source file.  (Well, there could be ".c", but