diff options
Diffstat (limited to 'src/starter')
| -rw-r--r-- | src/starter/.gitignore | 1 | ||||
| -rw-r--r-- | src/starter/Makefile.am | 12 | ||||
| -rw-r--r-- | src/starter/confread.c | 5 | ||||
| -rw-r--r-- | src/starter/keywords.h.in (renamed from src/starter/keywords.h) | 4 | ||||
| -rw-r--r-- | src/starter/keywords.txt | 1 |
5 files changed, 15 insertions, 8 deletions
diff --git a/src/starter/.gitignore b/src/starter/.gitignore index a370ee554..23142d9e8 100644 --- a/src/starter/.gitignore +++ b/src/starter/.gitignore @@ -1,4 +1,5 @@ starter +keywords.[ch] parser/lexer.c parser/parser.[ch] parser/parser.output
\ No newline at end of file diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index a3c58126e..c806e37e1 100644 --- a/src/starter/Makefile.am +++ b/src/starter/Makefile.am @@ -39,14 +39,20 @@ starter_LDADD = \ libstarter.la \ $(SOCKLIB) $(PTHREADLIB) $(ATOMICLIB) -EXTRA_DIST = keywords.txt ipsec.conf ipsec.secrets Android.mk -MAINTAINERCLEANFILES = keywords.c -BUILT_SOURCES = keywords.c parser/parser.h +EXTRA_DIST = keywords.h keywords.txt ipsec.conf ipsec.secrets Android.mk +MAINTAINERCLEANFILES = keywords.h keywords.c +BUILT_SOURCES = keywords.h keywords.c parser/parser.h if USE_LOAD_WARNING AM_CPPFLAGS += -DLOAD_WARNING endif +keywords.h: $(srcdir)/keywords.h.in + $(AM_V_GEN) \ + sed \ + -e "s:\@GPERF_LEN_TYPE\@:$(GPERF_LEN_TYPE):" \ + $< > $@ + keywords.c: $(srcdir)/keywords.txt $(srcdir)/keywords.h $(AM_V_GEN) \ $(GPERF) -m 10 -C -G -D -t < $(srcdir)/keywords.txt > $@ diff --git a/src/starter/confread.c b/src/starter/confread.c index e78f2a70b..b3e942fac 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -46,11 +46,6 @@ static const char esp_defaults[] = "aes128-sha256"; static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables"; /** - * Provided by GPERF - */ -extern const kw_entry_t *in_word_set(register const char*, register GPERF_LEN_TYPE); - -/** * Process deprecated keywords */ static bool is_deprecated(kw_token_t token, char *name, char *conn) diff --git a/src/starter/keywords.h b/src/starter/keywords.h.in index 0cb46a740..d2b08f2cf 100644 --- a/src/starter/keywords.h +++ b/src/starter/keywords.h.in @@ -196,4 +196,8 @@ struct kw_entry_t { kw_token_t token; }; +#ifndef IN_GPERF_GENERATED_FILE +const kw_entry_t *in_word_set(register const char*, register @GPERF_LEN_TYPE@); +#endif + #endif /* _KEYWORDS_H_ */ diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt index 3f92dc83f..dd673bc7a 100644 --- a/src/starter/keywords.txt +++ b/src/starter/keywords.txt @@ -16,6 +16,7 @@ #include <string.h> +#define IN_GPERF_GENERATED_FILE #include "keywords.h" %} |