4 files changed, 43 insertions, 13 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 4b6fcdba1..07e591ba8 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,8 @@
 1999-04-11  Tom Tromey  <tromey@cygnus.com>
 
+	* subobj.test: New file.
+	* Makefile.am (TESTS): Added subobj.test.
+
 	* confh.test: Use `sed' to extract full definition of
 	DIST_COMMON.  Look for stamp-h.in rule in include/Makefile.in.
 	* Makefile.am (XFAIL_TESTS): Removed confh.test.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f15058d9a..61493417d 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 \
-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 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 375978737..d9eb8ebc3 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -104,21 +104,22 @@ 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 \
-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 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)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
+DIST_SOURCES = 
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
 all: all-redirect
diff --git a/tests/subobj.test b/tests/subobj.test
new file mode 100755
index 000000000..f08276d3e
--- /dev/null
+++ b/tests/subobj.test
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# Test of subdir objects with C.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AM_PROG_CC_C_O
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = wish
+wish_SOURCES = generic/a.c generic/b.c
+END
+
+: > compile
+
+$AUTOMAKE || exit 1
+
+fgrep 'generic/a.o' Makefile.in || exit 1
+grep '[^/]a\.o' Makefile.in && exit 1
+
+# Opportunistically test for a different bug.
+grep '^generic/b.o:.*dirstamp' Makefile.in