From f1baf4e2f30646a409d8e8d7978b6b38a397b7a5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 16 Jul 2001 21:29:11 +0000 Subject: [PATCH] 2001-07-16 Alexandre Duret-Lutz * tests/subobj8.test: New file. * tests/Makefile.am (XFAIL_TESTS, TESTS): Add subobj8.test. --- ChangeLog | 5 +++++ tests/Makefile.am | 3 ++- tests/subobj8.test | 30 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100755 tests/subobj8.test diff --git a/ChangeLog b/ChangeLog index d6be0e2c..a7429c54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-07-16 Alexandre Duret-Lutz + + * tests/subobj8.test: New file. + * tests/Makefile.am (XFAIL_TESTS, TESTS): Add subobj8.test. + 2001-07-16 Tom Tromey Fix for PR automake/212: diff --git a/tests/Makefile.am b/tests/Makefile.am index 7e6e7b67..9c4e5259 100644 --- 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 index 00000000..9b9bfd17 --- /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 -- 2.43.5