* Makefile.in (.l.c): Modify rule for compatibility with recent

versions of flex, and remove most command-line options.
* ada-lex.l: Add %options line in place of -I -i and -s command-line
options.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9141c3d21cdcaafba43f8390711d3eab26b25420..99620d3c896a4aaf06995d35b004d9a5774593eb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-03  Paul Hilfinger  <hilfingr@nile.gnat.com>
+
+       * Makefile.in (.l.c): Modify rule for compatibility with recent
+       versions of flex, and remove most command-line options.
+       * ada-lex.l: Add %options line in place of -I -i and -s command-line
+       options.
+
 2004-10-02  Paul N. Hilfinger  <Hilfinger@gnat.com>
 
         Turn on initial Ada support (mainly expression evaluation).

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d7771756b9bdafadc65faa0959a9d0f7f4b01d1a..3a4bd371974c15e4d1fc7368d6eb4bc153af35d7 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1583,8 +1583,8 @@ po/$(PACKAGE).pot: force
        mv $@.new ./$*.c
 .l.c:
        @if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
-           echo $(FLEX) -Isit $< ">" $@; \
-           $(FLEX) -Isit $< > $@; \
+           echo $(FLEX) -o$@ $<; \
+           $(FLEX) -o$@ $<; \
        elif [ ! -f $@ -a ! -f $< ]; then \
            echo "$< missing and flex not available."; \
            false; \

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 6ecd849cdbc593bc8e06bc22b3e23d1e311ac286..10870581a6176fe5b899379f11edd6fa7fef3358 100644 (file)
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -26,9 +26,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* each successive token and places a semantic value into yylval */
 /* (ada-lval), defined by the parser.   */
 
-/* Run flex with (at least) the -i option (case-insensitive), and the -I */
-/* option (interactive---no unnecessary lookahead).  */
-
 DIG    [0-9]
 NUM10  ({DIG}({DIG}|_)*)
 HEXDIG [0-9a-f]
@@ -89,6 +86,8 @@ static int find_dot_all (const char *);
 
 %}
 
+%option case-insensitive interactive nodefault
+
 %s IN_STRING BEFORE_QUAL_QUOTE
 
 %%