* distcommon.test: New file.

	* Makefile.am (TESTS): Added new file.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 933acd2664a3bc57b1ef9e05ead434d44581c591..73d693ca46d1f9cf6ca9efb7e656d7c9c38653c6 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-07  Tom Tromey  <tromey@redhat.com>
+
+       * distcommon.test: New file.
+       * Makefile.am (TESTS): Added new file.
+
 2001-02-04  Tom Tromey  <tromey@redhat.com>
 
        * exsource.test: Updated for new include code.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5933509f2270d928f735acdcd9432d68a1c3a47..dada30e358a6cf3883c4eb69b70ad9283610bf27 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -210,6 +210,7 @@ recurs.test \
 recurs2.test \
 remake.test \
 remake2.test \
+remake3.test \
 req.test \
 rulepat.test \
 scripts.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5050c73e09ad4d4ef3703b48b26fc0c5bfe01e3d..e6dce4f733b0e72c206d42ebf1828280e512e7cb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -280,6 +280,7 @@ recurs.test \
 recurs2.test \
 remake.test \
 remake2.test \
+remake3.test \
 req.test \
 rulepat.test \
 scripts.test \

diff --git a/tests/distcommon.test b/tests/distcommon.test
new file mode 100755 (executable)
index 0000000..6072853
--- /dev/null
+++ b/tests/distcommon.test
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# A test for failure to include files provided in AC_OUTPUT into
+# DIST_COMMON
+# From Derek R. Price.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << EOF
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_OUTPUT(subdir/bar \
+         Makefile \
+         subdir/Makefile)
+EOF
+
+: > Makefile.am
+
+mkdir subdir
+: > subdir/Makefile.am
+: > subdir/bar.in
+
+$AUTOMAKE || exit 1
+
+# verify bar.in
+grep 'DIST_COMMON.*bar.in' subdir/Makefile.in || exit 1
+
+exit 0

diff --git a/tests/remake3.test b/tests/remake3.test
new file mode 100755 (executable)
index 0000000..fe1ce80
--- /dev/null
+++ b/tests/remake3.test
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Make sure remaking rules work when there is no subdir Makefile.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AC_OUTPUT(Makefile sub/foo)
+END
+
+: > Makefile.am
+
+mkdir sub
+: > sub/foo.in
+
+$AUTOMAKE || exit 1
+
+grep '^sub/foo' Makefile.in