* subobj4.test: New file.

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

diff --git a/tests/ChangeLog b/tests/ChangeLog
index fb5c62ce76fe6863606572e8d6aa1a06c3560611..1b1949694e7431ccffe05b3ffce1ea18a5cc6181 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-12  Tom Tromey  <tromey@redhat.com>
 
+       * subobj4.test: New file.
+       * Makefile.am (TESTS): Added subobj4.test.
+
        * cxxansi.test: New file.
        * Makefile.am (TESTS): Added cxxansi.test.
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f23474260f52ce5851bb25b0e351be58b31cddfc..09efb8c2878bcdd5cded34c7c73b50863966ebc1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -230,6 +230,7 @@ subdir4.test \
 subobj.test \
 subobj2.test \
 subobj3.test \
+subobj4.test \
 subst.test \
 suffix.test \
 suffix2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 856fa89169e588e0127783ecff668f5aead49cb7..a60168d3c334b93609eab382332ed209e54a9ba2 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -303,6 +303,7 @@ subdir4.test \
 subobj.test \
 subobj2.test \
 subobj3.test \
+subobj4.test \
 subst.test \
 suffix.test \
 suffix2.test \

diff --git a/tests/subobj4.test b/tests/subobj4.test
new file mode 100755 (executable)
index 0000000..ce2e438
--- /dev/null
+++ b/tests/subobj4.test
@@ -0,0 +1,40 @@
+#! /bin/sh
+
+# Make sure `../foo/foo.cpp' generates a rule.
+# Report from Dave Brolley.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AM_PROG_CC_C_O
+AC_PROG_CC
+AC_PROG_CXX
+AC_OUTPUT(Makefile d1/Makefile d2/Makefile)
+END
+
+mkdir d1 d2
+
+cat > Makefile.am << 'END'
+SUBDIRS = d1 d2
+END
+
+cat > d1/Makefile.am << 'END'
+bin_PROGRAMS = z
+z_SOURCES = ../d2/z.c
+END
+
+cat > d2/Makefile.am << 'END'
+END
+
+: > compile
+: > d2/z.c
+
+$AUTOMAKE || exit 1
+
+grep 'COMPILE.*z' d1/Makefile.in