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 c806e37e10dc07c4181b68d3169631e575fc52b0..457c0650e045ccf1f0b079fee87697beb868f333 100644 (file)
--- 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 e55e2030fddb4ac33f0b2311a99796002b00bd90..5c04b5ae79d81a310fe399d02e3c2cebce75fbe2 100644 (file)
--- 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 > $@