* subobj2.test: New file.

	* Makefile.am (TESTS): Added subobj2.test.

4 files changed, 38 insertions, 12 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 07e591ba8..13646db69 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,8 @@
 1999-04-11  Tom Tromey  <tromey@cygnus.com>
 
+	* subobj2.test: New file.
+	* Makefile.am (TESTS): Added subobj2.test.
+
 	* subobj.test: New file.
 	* Makefile.am (TESTS): Added subobj.test.
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 61493417d..5cd5e8d5e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,12 +39,12 @@ primary2.test proginst.test ranlib.test recurs.test recurs2.test \
 remake.test remake2.test req.test rulepat.test scripts.test seenc.test \
 sinclude.test spell.test spell2.test spell3.test spelling.test \
 stamph.test stdlib.test subdir.test subdir2.test subdir3.test \
-subobj.test subst.test suffix.test symlink.test syntax.test tags.test \
-tagsub.test target.test texinfo.test texinfo2.test texinfo3.test \
-texinfo4.test texinfo5.test texinfo6.test texinfo7.test texinfo8.test \
-unused.test version.test version2.test version3.test vpath.test	\
-vtexi.test vtexi2.test whoami.test xsource.test yacc.test yacc2.test \
-yacc3.test yaccpp.test
+subobj.test subobj2.test subst.test suffix.test symlink.test \
+syntax.test tags.test tagsub.test target.test texinfo.test \
+texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test \
+texinfo7.test texinfo8.test unused.test version.test version2.test \
+version3.test vpath.test vtexi.test vtexi2.test whoami.test \
+xsource.test yacc.test yacc2.test yacc3.test yaccpp.test
 
 EXTRA_DIST = defs $(TESTS)
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d9eb8ebc3..2737f0a1c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -104,12 +104,12 @@ primary2.test proginst.test ranlib.test recurs.test recurs2.test \
 remake.test remake2.test req.test rulepat.test scripts.test seenc.test \
 sinclude.test spell.test spell2.test spell3.test spelling.test \
 stamph.test stdlib.test subdir.test subdir2.test subdir3.test \
-subobj.test subst.test suffix.test symlink.test syntax.test tags.test \
-tagsub.test target.test texinfo.test texinfo2.test texinfo3.test \
-texinfo4.test texinfo5.test texinfo6.test texinfo7.test texinfo8.test \
-unused.test version.test version2.test version3.test vpath.test	\
-vtexi.test vtexi2.test whoami.test xsource.test yacc.test yacc2.test \
-yacc3.test yaccpp.test
+subobj.test subobj2.test subst.test suffix.test symlink.test \
+syntax.test tags.test tagsub.test target.test texinfo.test \
+texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test \
+texinfo7.test texinfo8.test unused.test version.test version2.test \
+version3.test vpath.test vtexi.test vtexi2.test whoami.test \
+xsource.test yacc.test yacc2.test yacc3.test yaccpp.test
 
 
 EXTRA_DIST = defs $(TESTS)
diff --git a/tests/subobj2.test b/tests/subobj2.test
new file mode 100755
index 000000000..606b19aab
--- /dev/null
+++ b/tests/subobj2.test
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+# Test of subdir objects with C++.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AC_PROG_CXX
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = generic/a.cc generic/b.cxx
+END
+
+: > compile
+
+$AUTOMAKE || exit 1
+
+fgrep 'generic/a.o' Makefile.in || exit 1
+grep '[^/]a\.o' Makefile.in && exit 1
+fgrep -e '-c -o' Makefile.in