starter: Use automake LEX/YACC automatisms.

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index f05aeca2296c00beb770ae5af2306b93626ec5f7..d676d1d1f8b4b07c74e725b86e42fe3e5c6bad56 100644 (file)
--- 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 ad5916f2e8ab332f940fc2a485bf16fdcb83b7c7..65d0a753ca509369ec113cf006b9a9784f616341 100644 (file)
--- 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 b003784c8ab700d99ae2673cc21757eedfe7b6c1..f5c13e6baafe9860c4d463e04c47881a98ee1ffb 100644 (file)
--- 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 fa3534163f341bc52ac664c5894acd39002de791..5f96fb1bc45181d5fa5e5f23413b426e575a27a3 100644 (file)
--- 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 5e60ba0dbfdd73c3eda63d07d074d45cc3b51e04..988b8ed48f563329f12f4aa6e7a0e29cebaf569a 100644 (file)
--- 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 c30010f27c1ca5824532a00de97f89c7c96d8248..734776a74a4133f39e508a1d80c5350a9c5df6f4 100644 (file)
--- 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 b0b1f6f21b496fdc158f688cc156244a58063b92..dfaec9ee89ddca68c183e38d8dd50cf60c8c9918 100644 (file)
--- 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