netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: kaber@trash.net
Subject: [PATCH nft 3/5] rename parser.y to parser_bison.y
Date: Thu,  6 Nov 2014 19:25:47 +0100	[thread overview]
Message-ID: <1415298349-985-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1415298349-985-1-git-send-email-pablo@netfilter.org>

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>
---
 src/Makefile.in                  |    4 ++--
 src/{parser.y => parser_bison.y} |    2 +-
 src/scanner.l                    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{parser.y => parser_bison.y} (99%)

diff --git a/src/Makefile.in b/src/Makefile.in
index 7ecc5f2..0c080f6 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 6209e9e..1c4046b 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 e36c3b1..e5f3a99 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
 
-- 
1.7.10.4


  parent reply	other threads:[~2014-11-06 18:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-06 18:25 [PATCH nft 0/5] autotools conversion Pablo Neira Ayuso
2014-11-06 18:25 ` [PATCH nft 1/5] build: use PKG_CHECK_MODULES to check for libmnl and libnftnl Pablo Neira Ayuso
2014-11-06 18:25 ` [PATCH nft 2/5] build: use AC_PROG_YACC and AM_PROG_LEX Pablo Neira Ayuso
2014-11-06 18:25 ` Pablo Neira Ayuso [this message]
2014-11-06 18:25 ` [PATCH nft 4/5] include: add cli.h Pablo Neira Ayuso
2014-11-06 18:25 ` [PATCH nft 5/5] build: autotools conversion Pablo Neira Ayuso
2014-11-06 20:29   ` Jan Engelhardt
2014-11-07 18:17   ` Giorgio
2014-11-09 20:26 ` [PATCH 1/1] autotools conversion fixups giorgio.nicole
2014-11-12 12:01   ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1415298349-985-4-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=kaber@trash.net \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).