From 771f528aafde43a65130171b0802b6905df5adae Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 13 Jan 2001 03:41:40 +0000 Subject: [PATCH] * subobj4.test: New file. * Makefile.am (TESTS): Added subobj4.test. --- tests/ChangeLog | 3 +++ tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/subobj4.test | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100755 tests/subobj4.test diff --git a/tests/ChangeLog b/tests/ChangeLog index fb5c62ce..1b194969 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,8 @@ 2001-01-12 Tom Tromey + * 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 f2347426..09efb8c2 100644 --- 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 856fa891..a60168d3 100644 --- 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 index 00000000..ce2e4385 --- /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 -- 2.43.5