From: Francis Dupont Date: Wed, 6 Feb 2019 13:06:56 +0000 (+0100) Subject: [453-update-makefile-using-bison] Update attempt X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee0b4f169ef96b2304b44b16ff956226a5692d8;p=thirdparty%2Fkea.git [453-update-makefile-using-bison] Update attempt --- diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am index ffea77b4df..5f7a1a1063 100644 --- a/src/bin/agent/Makefile.am +++ b/src/bin/agent/Makefile.am @@ -103,7 +103,8 @@ parser: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_pa # Call bison with -W to get warnings like unmarked empty rules # Note C++11 deprecated register still used by flex < 2.6.0 location.hh position.hh stack.hh agent_parser.cc agent_parser.h: agent_parser.yy - $(YACC) --defines=agent_parser.h --report=all --report-file=agent_parser.report -o agent_parser.cc agent_parser.yy + $(YACC) -Wno-yacc --defines=agent_parser.h --report=all \ + --report-file=agent_parser.report -o agent_parser.cc agent_parser.yy agent_lexer.cc: agent_lexer.ll $(LEX) --prefix agent_ -o agent_lexer.cc agent_lexer.ll diff --git a/src/bin/agent/agent_parser.yy b/src/bin/agent/agent_parser.yy index fe590f7fea..b788474073 100644 --- a/src/bin/agent/agent_parser.yy +++ b/src/bin/agent/agent_parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,7 +7,7 @@ %skeleton "lalr1.cc" /* -*- C++ -*- */ %require "3.0.0" %defines -%define parser_class_name {AgentParser} +%define api.parser.class {AgentParser} %define api.prefix {agent_} %define api.token.constructor %define api.value.type variant diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am index 7f52bafb40..9c1d999768 100644 --- a/src/bin/d2/Makefile.am +++ b/src/bin/d2/Makefile.am @@ -117,7 +117,8 @@ parser: d2_lexer.cc location.hh position.hh stack.hh d2_parser.cc d2_parser.h # Call bison with -W to get warnings like unmarked empty rules # Note C++11 deprecated register still used by flex < 2.6.0 location.hh position.hh stack.hh d2_parser.cc d2_parser.h: d2_parser.yy - $(YACC) --defines=d2_parser.h --report=all --report-file=d2_parser.report -o d2_parser.cc d2_parser.yy + $(YACC) -Wno-yacc --defines=d2_parser.h --report=all \ + --report-file=d2_parser.report -o d2_parser.cc d2_parser.yy d2_lexer.cc: d2_lexer.ll $(LEX) --prefix d2_parser_ -o d2_lexer.cc d2_lexer.ll diff --git a/src/bin/d2/d2_parser.yy b/src/bin/d2/d2_parser.yy index f3c770d7bd..9b21766191 100644 --- a/src/bin/d2/d2_parser.yy +++ b/src/bin/d2/d2_parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,7 +7,7 @@ %skeleton "lalr1.cc" /* -*- C++ -*- */ %require "3.0.0" %defines -%define parser_class_name {D2Parser} +%define api.parser.class {D2Parser} %define api.prefix {d2_parser_} %define api.token.constructor %define api.value.type variant diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am index 56defd6e6c..1313609321 100644 --- a/src/bin/dhcp4/Makefile.am +++ b/src/bin/dhcp4/Makefile.am @@ -131,7 +131,8 @@ parser: dhcp4_lexer.cc location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_pa # Call bison with -W to get warnings like unmarked empty rules # Note C++11 deprecated register still used by flex < 2.6.0 location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_parser.h: dhcp4_parser.yy - $(YACC) --defines=dhcp4_parser.h --report=all --report-file=dhcp4_parser.report -o dhcp4_parser.cc dhcp4_parser.yy + $(YACC) -Wno-yacc --defines=dhcp4_parser.h --report=all \ + --report-file=dhcp4_parser.report -o dhcp4_parser.cc dhcp4_parser.yy dhcp4_lexer.cc: dhcp4_lexer.ll $(LEX) --prefix parser4_ -o dhcp4_lexer.cc dhcp4_lexer.ll diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy index a91c949fb1..a2ef0cab39 100644 --- a/src/bin/dhcp4/dhcp4_parser.yy +++ b/src/bin/dhcp4/dhcp4_parser.yy @@ -7,7 +7,7 @@ %skeleton "lalr1.cc" /* -*- C++ -*- */ %require "3.0.0" %defines -%define parser_class_name {Dhcp4Parser} +%define api.parser.class {Dhcp4Parser} %define api.prefix {parser4_} %define api.token.constructor %define api.value.type variant diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am index 6d26c557c1..60d0c0920a 100644 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@ -132,7 +132,8 @@ parser: dhcp6_lexer.cc location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_pa # Call bison with -W to get warnings like unmarked empty rules # Note C++11 deprecated register still used by flex < 2.6.0 location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_parser.h: dhcp6_parser.yy - $(YACC) --defines=dhcp6_parser.h --report=all --report-file=dhcp6_parser.report -o dhcp6_parser.cc dhcp6_parser.yy + $(YACC) -Wno-yacc --defines=dhcp6_parser.h --report=all \ + --report-file=dhcp6_parser.report -o dhcp6_parser.cc dhcp6_parser.yy dhcp6_lexer.cc: dhcp6_lexer.ll $(LEX) --prefix parser6_ -o dhcp6_lexer.cc dhcp6_lexer.ll diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy index 71253663ec..fcd891c3b7 100644 --- a/src/bin/dhcp6/dhcp6_parser.yy +++ b/src/bin/dhcp6/dhcp6_parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,7 +7,7 @@ %skeleton "lalr1.cc" /* -*- C++ -*- */ %require "3.0.0" %defines -%define parser_class_name {Dhcp6Parser} +%define api.parser.class {Dhcp6Parser} %define api.prefix {parser6_} %define api.token.constructor %define api.value.type variant diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am index 50040b69b9..51edd27523 100644 --- a/src/bin/netconf/Makefile.am +++ b/src/bin/netconf/Makefile.am @@ -104,7 +104,9 @@ parser: netconf_lexer.cc location.hh position.hh stack.hh netconf_parser.cc netc # Call bison with -W to get warnings like unmarked empty rules # Note C++11 deprecated register still used by flex < 2.6.0 location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h: netconf_parser.yy - $(YACC) --defines=netconf_parser.h --report=all --report-file=netconf_parser.report -o netconf_parser.cc netconf_parser.yy + $(YACC) -Wno-yacc --defines=netconf_parser.h --report=all \ + --report-file=netconf_parser.report -o netconf_parser.cc \ + netconf_parser.yy netconf_lexer.cc: netconf_lexer.ll $(LEX) --prefix netconf_ -o netconf_lexer.cc netconf_lexer.ll diff --git a/src/bin/netconf/netconf_parser.yy b/src/bin/netconf/netconf_parser.yy index e7ccfe38f0..3d31eee31b 100644 --- a/src/bin/netconf/netconf_parser.yy +++ b/src/bin/netconf/netconf_parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,7 +7,7 @@ %skeleton "lalr1.cc" /* -*- C++ -*- */ %require "3.0.0" %defines -%define parser_class_name {NetconfParser} +%define api.parser.class {NetconfParser} %define api.prefix {netconf_} %define api.token.constructor %define api.value.type variant diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am index 5d04e08ac1..298051f978 100644 --- a/src/lib/eval/Makefile.am +++ b/src/lib/eval/Makefile.am @@ -93,7 +93,7 @@ parser: lexer.cc location.hh position.hh stack.hh parser.cc parser.h # This is especially useful if yydebug_ is set to 1 as that variable # will cause parser to print out its internal state. location.hh position.hh stack.hh parser.cc parser.h: parser.yy - $(YACC) --defines=parser.h -o parser.cc parser.yy + $(YACC) -Wno-yacc --defines=parser.h -o parser.cc parser.yy lexer.cc: lexer.ll $(LEX) --prefix eval -o lexer.cc lexer.ll diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy index f35fa23a77..0e3408b13d 100644 --- a/src/lib/eval/parser.yy +++ b/src/lib/eval/parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2015-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,7 +7,7 @@ %skeleton "lalr1.cc" /* -*- C++ -*- */ %require "3.0.0" %defines -%define parser_class_name {EvalParser} +%define api.parser.class {EvalParser} %define api.prefix {eval} %define api.token.constructor %define api.value.type variant