From 6fd59c085f99d8b823cd1d24d3110411c452cb87 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 9 Jan 2014 16:23:51 +0100 Subject: [PATCH] Bison: use %name-prefix directive rather than -p option --- src/Makefile.am | 2 +- src/cql.y | 1 + win/makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ca9d193..ad34fa6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ libyaz_server_la_LIBADD = libyaz.la libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS) -I$(top_srcdir)/libstemmer_c/include libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS) -AM_YFLAGS=-p cql_ +AM_YFLAGS= # MARC8->UTF8 conversion is generated from codetables.xml marc8.c: charconv.tcl codetables.xml diff --git a/src/cql.y b/src/cql.y index cf85690..324c3e7 100644 --- a/src/cql.y +++ b/src/cql.y @@ -55,6 +55,7 @@ int yyerror(void *lval, char *msg); %} +%name-prefix "cql_" %lex-param {void *parm} %parse-param {void *parm} %pure-parser diff --git a/win/makefile b/win/makefile index 2b9ae83..0dc130f 100644 --- a/win/makefile +++ b/win/makefile @@ -881,7 +881,7 @@ $(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA !if $(HAVE_BISON) $(SRCDIR)\cql.c: $(SRCDIR)\cql.y @cd $(SRCDIR) - $(BISON) -y -p cql_ -o cql.c cql.y + $(BISON) -y -o cql.c cql.y !endif -- 1.7.10.4