Add -p and -P flags to bison and flex, to prefix yy* symbols with _gst_parse_yy....

Original commit message from CVS:
Add -p and -P flags to bison and flex, to prefix yy* symbols with
_gst_parse_yy.  This fixes symbol conflict with other libs.
(Should go into 0.4.1.)

diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am
index 14ba2b2..d67ed5c 100644 (file)
--- a/gst/parse/Makefile.am
+++ b/gst/parse/Makefile.am
@@ -1,20 +1,20 @@
 noinst_LTLIBRARIES = libgstparse.la
 
-libgstparse_la_SOURCES = lex.yy.c grammar.tab.c
+libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c
 
-BISON = bison -d -v
+BISON = bison -d -v -p_gst_parse__yy
 
 libgstparse_la_CFLAGS = $(LIBGST_CFLAGS)
 libgstparse_la_LIBADD = $(LIBGST_LIBS)
 
 noinst_HEADERS = grammar.tab.h
 
-BUILT_SOURCES = grammar.tab.h grammar.tab.c lex.yy.c 
+BUILT_SOURCES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c 
 
 EXTRA_DIST = grammar.y parse.l types.h
 
 grammar.tab.c grammar.tab.h: grammar.y
        $(BISON) $^
  
-lex.yy.c: parse.l
-       flex $^
+lex._gst_parse_yy.c: parse.l
+       flex -P_gst_parse_yy $^

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index b55b17e..c367518 100644 (file)
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -123,7 +123,7 @@ rconnection:   '!'                   { $$ = g_new0 (connection_t, 1); }
 
 %%
 
-extern FILE *yyin;
+extern FILE *_gst_parse_yyin;
 int _gst_parse_yylex (YYSTYPE *lvalp);
 
 static int yylex (void *lvalp) {
@@ -137,7 +137,7 @@ yyerror (const char *s)
   return -1;
 }
 
-int yy_scan_string (char*);
+int _gst_parse_yy_scan_string (char*);
 
 graph_t * _gst_parse_launch (const gchar *str, GError **error)
 {
@@ -147,10 +147,10 @@ graph_t * _gst_parse_launch (const gchar *str, GError **error)
     g_return_val_if_fail (str != NULL, NULL);
 
     dstr = g_strdup (str);
-    yy_scan_string (dstr);
+    _gst_parse_yy_scan_string (dstr);
 
 #ifdef DEBUG
-    yydebug = 1;
+    _gst_parse_yydebug = 1;
 #endif
 
     if (yyparse (&g) != 0) {