* tests/Makefile.am (TESTS): Added yacc5.test.

	* tests/yacc5.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 261bba82d664699223aba0b381c1c73a7925b1c2..929bfd1dbb37b31fc8f2cb44c5030a238da86fc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-19  Tom Tromey  <tromey@redhat.com>
+
+       * tests/Makefile.am (TESTS): Added yacc5.test.
+       * tests/yacc5.test: New file.
+
 2001-06-17  Tom Tromey  <tromey@redhat.com>
 
        * automake.in (require_file_internal): Check for already-required

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3075821b897767549d8dade1765b3156f411ca30..0025cccc01e1da29cd0cfec180cdef9611a60441 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -298,6 +298,7 @@ yacc.test \
 yacc2.test \
 yacc3.test \
 yacc4.test \
+yacc5.test \
 yacc6.test \
 yaccpp.test \
 yaccvpath.test

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d4502bbefa996672eb73d27608d033e9d5394efd..d077c99efd54b799ad9218441308d7f813e64569 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -364,6 +364,7 @@ yacc.test \
 yacc2.test \
 yacc3.test \
 yacc4.test \
+yacc5.test \
 yacc6.test \
 yaccpp.test \
 yaccvpath.test

diff --git a/tests/yacc5.test b/tests/yacc5.test
new file mode 100755 (executable)
index 0000000..4e66f3a
--- /dev/null
+++ b/tests/yacc5.test
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+# Test of yacc functionality, derived from GNU binutils
+# by Tim Van Holder.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = maude
+maude_SOURCES = sub/maude.y
+END
+
+mkdir sub
+
+: > sub/maude.y
+
+$ACLOCAL || exit 1
+$AUTOMAKE -a || exit 1
+
+grep '^maude\.c:' Makefile.in || exit 1
+
+
+## Try again with subdir-objects.
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = maude
+maude_SOURCES = sub/maude.y
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE -a || exit 1
+
+grep '^sub/maude\.c:' Makefile.in