From e62a1274ecd7abb8ee784e5921fe4e6af258de01 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 6 Aug 1996 18:32:07 +0000
Subject: [PATCH] Fix for lex

---
 ChangeLog         |  3 +++
 TODO              |  4 ++++
 automake.in       |  2 +-
 tests/ChangeLog   |  4 ++++
 tests/Makefile.am |  2 +-
 tests/Makefile.in |  2 +-
 tests/lex.test    | 16 ++++++++++++++++
 7 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100755 tests/lex.test

diff --git a/ChangeLog b/ChangeLog
index 065ffc78..ebbb9489 100644
--- 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 42be081d..0473c180 100644
--- 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 b5c7cdcc..e7278ee8 100755
--- 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 dbd3d2f2..ea975471 100644
--- 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 89476c4e..e0bb041f 100644
--- 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 8161bbd5..38b72ce1 100644
--- 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
index 00000000..42505fa4
--- /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
-- 
2.43.5