include a single, automatically generated version number in flex scanners

diff --git a/Makefile.am b/Makefile.am
index 7bbeccd15707bb41020440105add071b043d8e3c..9ac24ff38a614acfd9b1586cf0388a50429a2c3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,7 +127,7 @@ INCLUDES = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
 LIBS = @LIBINTL@ @LIBS@
 
 skel.c: flex.skl mkskel.sh
-       $(m4) -P $(srcdir)/flex.skl | $(SHELL) $(srcdir)/mkskel.sh  >skel.c
+       $(m4) -P -DVERSION=$(VERSION) $(srcdir)/flex.skl | $(SHELL) $(srcdir)/mkskel.sh  >skel.c
 
 $(man_MANS): $(srcdir)/main.c
        for i in $(man_MANS) ; do \

diff --git a/flex.skl b/flex.skl
index d58307870b6a8b08106f560bd18857400a850f74..9ba57e20c8f6278b3e6391f3d0c14973a28f2dd5 100644 (file)
--- a/flex.skl
+++ b/flex.skl
@@ -1,3 +1,4 @@
+m4_changecom
 %# -*-C-*- vi: set ft=c:
 /* A lexical scanner generated by flex */
 
@@ -5,7 +6,7 @@
 %# and affect the generation of the scanner. The possible control codes are
 %# listed and processed in misc.c.
 %#
-%#   %#  -  A comment. The current line is ommited from the generated scanner.
+%#   %#  -  A comment. The current line is omitted from the generated scanner.
 %#   %push      -  Push the current state of the skel processing
 %#                 A push is typically followed by one of the commands below.
 %#   %pop       -  Pop the state.
@@ -29,8 +30,7 @@
 %#   edit the skeleton.
 %#
 #define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_VERSION VERSION
 
 /* First, we deal with  platform-specific or compiler-specific issues. */
 

diff --git a/flex.texi b/flex.texi
index 5e7894ee107a873c923efd69a5bba7f4487ad3b4..38274f52a56f942b19b705b71ab8dce83012e273 100644 (file)
--- a/flex.texi
+++ b/flex.texi
@@ -4512,10 +4512,7 @@ ignores them.
 @item
 The name @code{FLEX_SCANNER} is @code{#define}'d so scanners may be
 written for use with either @code{flex} or @code{lex}.  Scanners also
-include @code{YY_FLEX_MAJOR_VERSION} and @code{YY_FLEX_MINOR_VERSION}
-indicating which version of @code{flex} generated the scanner (for
-example, for the 2.5 release, these defines would be 2 and 5
-respectively).
+include @code{YY_FLEX_VERSION} indicating which version of @code{flex} generated the scanner.
 @end itemize
 
 @cindex POSIX, non-POSIX features of flex