c++ -vs- libobjs fix

8 files changed, 48 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 034f95d0f..a925d7976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 10 23:17:19 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (handle_lib_objects): Set seen_c_source as
+	appropriate.  From Alexander V. Lukyanov.
+
 Sat Mar  8 22:54:35 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* texinfo.tex: New version.
diff --git a/THANKS b/THANKS
index 64d364fa0..b37e3edfa 100644
--- a/THANKS
+++ b/THANKS
@@ -2,7 +2,7 @@ Automake was originally written by David J. MacKenzie <djm@uunet.uu.net>.
 It would not be what it is today without the invaluable help of these
 people:
 
-"Garrett D'Amore" <garrett@qualcomm.com>
+Alexander V. Lukyanov <lav@yars.free.net>
 Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Anthony Green <green@cygnus.com>
 David A. Swierczek <swiercze@mr.med.ge.com>
@@ -10,6 +10,7 @@ Dieter Baron <dillo@stieltjes.smc.univie.ac.at>
 Erick Branderhorst <branderh@iaehv.nl>
 François Pinard <pinard@iro.umontreal.ca>
 Fred Fish <fnf@ninemoons.com>
+Garrett D'Amore <garrett@qualcomm.com>
 Glenn Amerine <glenn@pie.mhsc.org>
 Gord Matzigkeit <gord@enci.ucalgary.ca>
 Greg A. Woods <woods@most.weird.com>
diff --git a/TODO b/TODO
index f71c71800..b29d1f9b0 100644
--- a/TODO
+++ b/TODO
@@ -245,6 +245,8 @@ Lex, yacc support:
 * Consider supporting syntax from autoconf "derived:source", eg:
 	y.tab.c:perly.y
   for yacc and lex source
+* what if you use flex and the option to avoid -lfl?
+  should support this?
 
 Multi-language support:
 * should have mapping of file extensions to languages
diff --git a/automake.in b/automake.in
index ad07f182e..0b1a873aa 100755
--- a/automake.in
+++ b/automake.in
@@ -1220,7 +1220,11 @@ sub handle_lib_objects
 	    local ($iter, $rewrite);
 	    foreach $iter (keys %libsources)
 	    {
-		if ($iter =~ /\.h$/)
+		if ($iter =~ /\.[cly]$/)
+		{
+		    $seen_c_source = 1;
+		}
+		elsif ($iter =~ /\.h$/)
 		{
 		    &require_file_with_line ($var, $FOREIGN, $iter);
 		}
@@ -1240,6 +1244,7 @@ sub handle_lib_objects
 		if ! defined $libsources{'alloca.c'};
 	    $dep_files{'.deps/alloca.P'} = 1;
 	    &require_file_with_line ($var, $FOREIGN, 'alloca.c');
+	    $seen_c_source = 1;
 	}
 	elsif ($lsearch eq '@LEXLIB@')
 	{
@@ -1249,7 +1254,6 @@ sub handle_lib_objects
 	    # made, I think.
 	    $lex_ok = 1;
 	}
-
     }
 
     if (! $lex_ok)
diff --git a/tests/ChangeLog b/tests/ChangeLog
index dcefe6dba..4c8c81f1c 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 10 23:21:03 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* cxxlibobj.test: New file.
+
 Wed Feb 26 13:05:42 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* tagsub.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bafa66af0..b34b70d64 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,8 @@ distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
-defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test
+defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \
+cxxlibobj.test
 
 EXTRA_DIST = defs $(TESTS)
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0daa493f4..32bba0aa6 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,7 +66,8 @@ distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
-defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test
+defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \
+cxxlibobj.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
new file mode 100755
index 000000000..13add3482
--- /dev/null
+++ b/tests/cxxlibobj.test
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Test to make sure LIBOBJS and C++ sources work right.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+AC_PROG_CC
+AC_REPLACE_FUNCS(strdup)
+END
+
+cat > Makefile.am << 'END'
+sbin_PROGRAMS = anonymous
+anonymous_SOURCES = doe.C jane.C
+anonymous_LDADD = @LIBOBJS@
+END
+
+: > strdup.c
+: > doe.C
+: > jane.C
+
+$AUTOMAKE || exit 1
+
+grep CC Makefile.in