From 6f4eaa41a7f9adbbcfef47032ac07aa11e0b6b48 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 10 Oct 2011 19:31:04 +0200
Subject: [PATCH] starter: Use automake LEX/YACC automatisms.

---
 src/starter/Makefile.am                  | 21 ++++++++-------------
 src/starter/args.c                       |  1 -
 src/starter/args.h                       |  2 +-
 src/starter/confread.c                   |  1 -
 src/starter/confread.h                   |  2 +-
 src/starter/{parser.h => ipsec-parser.h} |  0
 src/starter/{parser.l => lexer.l}        |  2 +-
 src/starter/parser.y                     |  2 +-
 8 files changed, 12 insertions(+), 19 deletions(-)
 rename src/starter/{parser.h => ipsec-parser.h} (100%)
 rename src/starter/{parser.l => lexer.l} (99%)

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index f05aeca22..d676d1d1f 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -1,9 +1,10 @@
 ipsec_PROGRAMS = starter
-starter_SOURCES = y.tab.c netkey.c y.tab.h parser.h args.h netkey.h \
+starter_SOURCES = \
+netkey.c parser.y lexer.l ipsec-parser.h args.h netkey.h \
 starterwhack.c starterwhack.h starterstroke.c invokepluto.c confread.c \
 starterstroke.h interfaces.c invokepluto.h confread.h interfaces.h args.c \
 keywords.c files.h keywords.h cmp.c starter.c cmp.h exec.c invokecharon.c \
-exec.h invokecharon.h lex.yy.c loglite.c klips.c klips.h
+exec.h invokecharon.h loglite.c klips.c klips.h
 
 INCLUDES = \
 -I${linux_headers} \
@@ -23,9 +24,12 @@ AM_CFLAGS = \
 -DDEV_URANDOM=\"${urandom_device}\" \
 -DDEBUG
 
+AM_YFLAGS = -v -d
+
 starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la $(SOCKLIB)
-EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf
-MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c
+EXTRA_DIST = keywords.txt ipsec.conf
+MAINTAINERCLEANFILES = keywords.c
+BUILT_SOURCES = parser.h
 
 PLUTODIR=$(top_srcdir)/src/pluto
 SCEPCLIENTDIR=$(top_srcdir)/src/scepclient
@@ -42,15 +46,6 @@ if USE_LOAD_WARNING
   AM_CFLAGS += -DLOAD_WARNING
 endif
 
-lex.yy.c:	$(srcdir)/parser.l $(srcdir)/parser.y $(srcdir)/parser.h y.tab.h
-		$(LEX) $(srcdir)/parser.l
-
-y.tab.c:	$(srcdir)/parser.y $(srcdir)/parser.l $(srcdir)/parser.h
-		$(YACC) -v -d $(srcdir)/parser.y
-
-y.tab.h:	$(srcdir)/parser.y $(srcdir)/parser.l $(srcdir)/parser.h
-		$(YACC) -v -d $(srcdir)/parser.y
-
 keywords.c:	$(srcdir)/keywords.txt $(srcdir)/keywords.h
 		$(GPERF) -m 10 -C -G -D -t < $(srcdir)/keywords.txt > $@
 
diff --git a/src/starter/args.c b/src/starter/args.c
index ad5916f2e..65d0a753c 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -24,7 +24,6 @@
 #include "../pluto/log.h"
 
 #include "keywords.h"
-#include "parser.h"
 #include "confread.h"
 #include "args.h"
 
diff --git a/src/starter/args.h b/src/starter/args.h
index b003784c8..f5c13e6ba 100644
--- a/src/starter/args.h
+++ b/src/starter/args.h
@@ -17,7 +17,7 @@
 #define _ARGS_H_
 
 #include "keywords.h"
-#include "parser.h"
+#include "ipsec-parser.h"
 
 extern char **new_list(char *value);
 extern bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw
diff --git a/src/starter/confread.c b/src/starter/confread.c
index fa3534163..5f96fb1bc 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -29,7 +29,6 @@
 #include "../pluto/log.h"
 
 #include "keywords.h"
-#include "parser.h"
 #include "confread.h"
 #include "args.h"
 #include "files.h"
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 5e60ba0db..988b8ed48 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -20,7 +20,7 @@
 #include <freeswan.h>
 #endif
 
-#include "parser.h"
+#include "ipsec-parser.h"
 #include "interfaces.h"
 
 typedef enum {
diff --git a/src/starter/parser.h b/src/starter/ipsec-parser.h
similarity index 100%
rename from src/starter/parser.h
rename to src/starter/ipsec-parser.h
diff --git a/src/starter/parser.l b/src/starter/lexer.l
similarity index 99%
rename from src/starter/parser.l
rename to src/starter/lexer.l
index c30010f27..734776a74 100644
--- a/src/starter/parser.l
+++ b/src/starter/lexer.l
@@ -22,7 +22,7 @@
 #include <glob.h>
 #endif
 
-#include "y.tab.h"
+#include "parser.h"
 
 #define MAX_INCLUDE_DEPTH  20
 
diff --git a/src/starter/parser.y b/src/starter/parser.y
index b0b1f6f21..dfaec9ee8 100644
--- a/src/starter/parser.y
+++ b/src/starter/parser.y
@@ -22,7 +22,7 @@
 #include "../pluto/constants.h"
 #include "../pluto/defs.h"
 #include "../pluto/log.h"
-#include "parser.h"
+#include "ipsec-parser.h"
 
 #define YYERROR_VERBOSE
 #define ERRSTRING_LEN   256