Changed lexycal scanner to link without libfl.

diff --git a/src/Makefile.am b/src/Makefile.am
index 2842ca0fa62a8bec5c1392784c68f43380994ac3..15c0e603edbbad7490f606c1d52fdbe4ac90f793 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-LIBS = $(REPTOOL_LIBS) \
-       -lfl
+LIBS = $(REPTOOL_LIBS)
 
 AM_CPPFLAGS = $(REPTOOL_CFLAGS) \
               -DG_LOG_DOMAIN=\"libreptool\"

diff --git a/src/lexycal.fl b/src/lexycal.fl
index beaec2a80d2c0f3074519521b5c0842f518f0290..b26d54cd5a97b6517177033d58a11862b2aeadbf 100644 (file)
--- a/src/lexycal.fl
+++ b/src/lexycal.fl
@@ -58,3 +58,10 @@ DIGIT        [0-9]
                                                                }
 
 .|" "|\n       /* eat up unmatched chars */
+
+%%
+
+int yywrap (void)
+{
+       return 1;
+}

diff --git a/src/lexycal.yy.c b/src/lexycal.yy.c
index 376f157ea33874ab1f46a76c1cf8ff78818c92db..f92b546f6cde7601281e68312710f7fca5e74ce5 100644 (file)
--- a/src/lexycal.yy.c
+++ b/src/lexycal.yy.c
@@ -339,6 +339,8 @@ void yyfree (void *  );
 
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
+/* Begin user sect3 */
+
 typedef unsigned char YY_CHAR;
 
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
@@ -495,7 +497,7 @@ char *yytext;
 #include <glib.h>
 
 #include "parser.tab.h"
-#line 499 "lexycal.yy.c"
+#line 501 "lexycal.yy.c"
 
 #define INITIAL 0
 
@@ -685,7 +687,7 @@ YY_DECL
 #line 11 "lexycal.fl"
 
 
-#line 689 "lexycal.yy.c"
+#line 691 "lexycal.yy.c"
 
        if ( !(yy_init) )
                {
@@ -853,10 +855,10 @@ YY_RULE_SETUP
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 61 "lexycal.fl"
+#line 62 "lexycal.fl"
 ECHO;
        YY_BREAK
-#line 860 "lexycal.yy.c"
+#line 862 "lexycal.yy.c"
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
@@ -1854,4 +1856,12 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 61 "lexycal.fl"
+#line 62 "lexycal.fl"
+
+
+
+int yywrap (void)
+{
+       return 1;
+}
+

diff --git a/src/lexycal.yy.h b/src/lexycal.yy.h
index 7475d3fb01ed034843a1722074d426e5b6989abd..b35abc0c2f86963c9b911bca6833d1a12a6cf498 100644 (file)
--- a/src/lexycal.yy.h
+++ b/src/lexycal.yy.h
@@ -207,6 +207,8 @@ void *yyalloc (yy_size_t  );
 void *yyrealloc (void *,yy_size_t  );
 void yyfree (void *  );
 
+/* Begin user sect3 */
+
 extern int yylineno;
 
 extern char *yytext;
@@ -322,8 +324,9 @@ extern int yylex (void);
 #undef YY_DECL
 #endif
 
-#line 61 "lexycal.fl"
+#line 62 "lexycal.fl"
+
 
-#line 328 "lexycal.yy.h"
+#line 331 "lexycal.yy.h"
 #undef yyIN_HEADER
 #endif /* yyHEADER_H */