Fix for lex

diff --git a/ChangeLog b/ChangeLog
index 065ffc78d7eb5aeaab762c77538aa7ae10653cd5..ebbb9489e63a34178b3c99832c7da24824a7f4a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Tue Aug  6 10:58:37 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_source_transform): Correctly handle lex
+       source.  Test lex.test
+
        * aclocal.in (parse_arguments): Mention GNU.
        * automake.in (parse_arguments): Mention GNU.
 

diff --git a/TODO b/TODO
index 42be081d5b5ad74fab9b83c74046e7a5257993c5..0473c18079a71c00c56c52029d132c32ad1fc688 100644 (file)
--- a/TODO
+++ b/TODO
@@ -13,6 +13,10 @@ _CXX_PROGRAMS, etc, and have the right linker used by each.
   overridable on per-program basis
 * what about EXTRA_PROGRAMS stuff?
 
+** many requests for a way to omit a file from the distribution.
+   Should be done like `!foo' or `~foo' in _SOURCES, etc.
+   Such files should be removed explicitly after the copy step!
+
 add support for Makefile.tmpl that is auto-included in every
 Makefile.am.  That makes it easier to do some non-std thing in every
 subdirectory.

diff --git a/automake.in b/automake.in
index b5c7cdcc4d13c59aeebd59539e34aa85856e26c3..e7278ee840ffbefca80ac2aa05cee8aa5146b6bb 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -608,7 +608,7 @@ sub handle_source_transform
                next if /^\@.*\@$/;
 
                # Include .c file for lex or yacc source in distribution.
-               if (/^(.*)\.[yl]$/)
+               if (/^(.*)\.y$/)
                {
                    # Yacc source.
                    &push_dist_common ($1 . '.c');

diff --git a/tests/ChangeLog b/tests/ChangeLog
index dbd3d2f27bfaf571672d7d48694ea2b91b7a9bfa..ea9754712382ce23e52daa209fb6c025528539a8 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug  6 12:30:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * lex.test: New file.
+
 Mon Aug  5 01:03:03 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * obsolete.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89476c4e4557af2b61a759abd25f516301130e05..e0bb041f304f254fc93e8a11c99d70c0f761cbe4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,6 +11,6 @@ canon3.test mdate2.test subdir.test backsl.test package.test number.test \
 insh2.test outdir.test fpinstall.test fpinst2.test texinfo.test dejagnu.test \
 yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
-man.test info.test obsolete.test
+man.test info.test obsolete.test lex.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8161bbd5faac5ae966c6486e2fe6d2c291fd02f3..38b72ce12273e27b8223cacdbdedc2f85250f4bc 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -49,7 +49,7 @@ canon3.test mdate2.test subdir.test backsl.test package.test number.test \
 insh2.test outdir.test fpinstall.test fpinst2.test texinfo.test dejagnu.test \
 yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
-man.test info.test obsolete.test
+man.test info.test obsolete.test lex.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/lex.test b/tests/lex.test
new file mode 100755 (executable)
index 0000000..42505fa
--- /dev/null
+++ b/tests/lex.test
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+# Test to make sure that lex source generates correct target.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = zot
+zot_SOURCES = joe.l
+END
+
+: > joe.l
+
+$AUTOMAKE || exit 1
+
+grep '\$(LEX)' Makefile.in