2001-07-16 Alexandre Duret-Lutz <duret_g@epita.fr>

	* tests/subobj8.test: New file.
	* tests/Makefile.am (XFAIL_TESTS, TESTS): Add subobj8.test.

diff --git a/ChangeLog b/ChangeLog
index d6be0e2ce7ecc7135a31b1ffe26a58bff8d71fb9..a7429c540863e934adf0eb0adade084382cb2e46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * tests/subobj8.test: New file.
+       * tests/Makefile.am (XFAIL_TESTS, TESTS): Add subobj8.test.
+
 2001-07-16  Tom Tromey  <tromey@redhat.com>
 
        Fix for PR automake/212:

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7e6e7b678341ccada14139a36a497185c54e2997..9c4e52597c5495ec79e815b7d4f62bcd010ad8ff 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = subdir5.test
+XFAIL_TESTS = subdir5.test subobj8.test
 
 TESTS =        \
 acinclude.test \
@@ -264,6 +264,7 @@ subobj4.test \
 subobj5.test \
 subobj6.test \
 subobj7.test \
+subobj8.test \
 subst.test \
 suffix.test \
 suffix2.test \

diff --git a/tests/subobj8.test b/tests/subobj8.test
new file mode 100755 (executable)
index 0000000..9b9bfd1
--- /dev/null
+++ b/tests/subobj8.test
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# Make sure `compile' is included when subdir-objects is used in a subdir.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(Makefile.am)
+AC_CONFIG_AUX_DIR(tools)
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_OUTPUT(Makefile foo/Makefile)
+END
+
+mkdir tools foo foo/bar
+
+cat > Makefile.am << 'END'
+SUBDIRS = foo
+END
+
+cat > foo/Makefile.am << 'EOF'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = mumble
+mumble_SOURCES = bar/a.c
+EOF
+
+$ACLOCAL || exit 1
+$AUTOMAKE --add-missing || exit 1
+test -f tools/compile || exit 1