From: Tobias Brunner Date: Wed, 11 Oct 2017 16:10:46 +0000 (+0200) Subject: starter: Add the correct keywords header file to EXTRA_DIST X-Git-Tag: 5.6.1rc1~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a97de61e78df611207a2700dad7057d9b74fb5bc;p=thirdparty%2Fstrongswan.git 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") --- diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am index c806e37e10..457c0650e0 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 e55e2030fd..5c04b5ae79 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 > $@