diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-10-11 18:10:46 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-10-12 09:09:12 +0200 |
| commit | a97de61e78df611207a2700dad7057d9b74fb5bc (patch) | |
| tree | 99a83d6aee36b998d0ba928088fc4058f7110265 /src | |
| parent | 0d08959a040708c74f1302d5af4c2ddabd328324 (diff) | |
| download | strongswan-a97de61e78df611207a2700dad7057d9b74fb5bc.tar.bz2 strongswan-a97de61e78df611207a2700dad7057d9b74fb5bc.tar.xz | |
starter: Add the correct keywords header file to EXTRA_DIST
The fix for gperf in 0ae19f0ced8d added the generated header to
EXTRA_DIST but that's already added to the distribution because it is
contained in *_SOURCES, what was not added, though, was the .h.in file.
Also fixes the reference to the header file in the .c rule here and for
stroke in out-of-tree builds.
Fixes: 0ae19f0ced8d ("configure: Fix gperf length parameter determination")
Diffstat (limited to 'src')
| -rw-r--r-- | src/starter/Makefile.am | 4 | ||||
| -rw-r--r-- | src/stroke/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index c806e37e1..457c0650e 100644 --- a/src/starter/Makefile.am +++ b/src/starter/Makefile.am @@ -39,7 +39,7 @@ starter_LDADD = \ libstarter.la \ $(SOCKLIB) $(PTHREADLIB) $(ATOMICLIB) -EXTRA_DIST = keywords.h keywords.txt ipsec.conf ipsec.secrets Android.mk +EXTRA_DIST = keywords.h.in keywords.txt ipsec.conf ipsec.secrets Android.mk MAINTAINERCLEANFILES = keywords.h keywords.c BUILT_SOURCES = keywords.h keywords.c parser/parser.h @@ -53,7 +53,7 @@ keywords.h: $(srcdir)/keywords.h.in -e "s:\@GPERF_LEN_TYPE\@:$(GPERF_LEN_TYPE):" \ $< > $@ -keywords.c: $(srcdir)/keywords.txt $(srcdir)/keywords.h +keywords.c: $(srcdir)/keywords.txt keywords.h $(AM_V_GEN) \ $(GPERF) -m 10 -C -G -D -t < $(srcdir)/keywords.txt > $@ diff --git a/src/stroke/Makefile.am b/src/stroke/Makefile.am index e55e2030f..5c04b5ae7 100644 --- a/src/stroke/Makefile.am +++ b/src/stroke/Makefile.am @@ -17,6 +17,6 @@ stroke_keywords.h: $(srcdir)/stroke_keywords.h.in -e "s:\@GPERF_LEN_TYPE\@:$(GPERF_LEN_TYPE):" \ $< > $@ -stroke_keywords.c: $(srcdir)/stroke_keywords.txt $(srcdir)/stroke_keywords.h +stroke_keywords.c: $(srcdir)/stroke_keywords.txt stroke_keywords.h $(AM_V_GEN) \ $(GPERF) -m 10 -D -C -G -t < $(srcdir)/stroke_keywords.txt > $@ |