From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 6 Nov 2014 12:34:48 +0000 (+0100)
Subject: rename parser.y to parser_bison.y
X-Git-Tag: v0.4~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=850e311d98a2340a9d2d86d28a4d2280fa6cf76c;p=thirdparty%2Fnftables.git

rename parser.y to parser_bison.y

The conversion to the autotools need this.

Make sure you remove the autogenerated parser.c and parser.h from
your tree.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 7ecc5f2e..0c080f6b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -26,8 +26,8 @@ nft-obj			+= utils.o
 nft-obj			+= erec.o
 nft-obj			+= mnl.o
 
-nft-obj			+= parser.o
-nft-extra-clean-files	+= parser.c parser.h
+nft-obj			+= parser_bison.o
+nft-extra-clean-files	+= parser_bison.c parser_bison.h
 
 nft-obj			+= scanner.o
 nft-extra-clean-files	+= scanner.c scanner.h
diff --git a/src/parser.y b/src/parser_bison.y
similarity index 99%
rename from src/parser.y
rename to src/parser_bison.y
index 9108dd22..85a1fb46 100644
--- a/src/parser.y
+++ b/src/parser_bison.y
@@ -32,7 +32,7 @@
 #include <parser.h>
 #include <erec.h>
 
-#include "parser.h"
+#include "parser_bison.h"
 #include "scanner.h"
 
 void parser_init(struct parser_state *state, struct list_head *msgs)
diff --git a/src/scanner.l b/src/scanner.l
index 9c8546e2..157c1e98 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -20,7 +20,7 @@
 #include <erec.h>
 #include <rule.h>
 #include <parser.h>
-#include "parser.h"
+#include "parser_bison.h"
 
 #define YY_NO_INPUT