From 3d50beacbee2c5aaa961532809d534b342fa89f0 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Tue, 22 Sep 2015 14:00:37 +0200 Subject: [PATCH] Move gperf invocation for RegisteredHeadersHash to source-maintenance.sh Portability fixes for non-GNU make. --- scripts/source-maintenance.sh | 3 +++ src/http/Makefile.am | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh index 9f0a0da2bc..c4548a7e8f 100755 --- a/scripts/source-maintenance.sh +++ b/scripts/source-maintenance.sh @@ -277,6 +277,9 @@ done echo " " )| sed s%${ROOT}/src/%%g >${ROOT}/src/tests/Stub.list +# Build the GPERF generated content +make -C src/http gperf-files + # Run formating echo "" >${ROOT}/doc/debug-sections.tmp srcformat || exit 1 diff --git a/src/http/Makefile.am b/src/http/Makefile.am index 03cff1ef68..93a52b2477 100644 --- a/src/http/Makefile.am +++ b/src/http/Makefile.am @@ -21,7 +21,6 @@ libsquid_http_la_SOURCES = \ RegisteredHeaders.h \ RegisteredHeaders.cc \ RegisteredHeadersHash.cci \ - RegisteredHeadersHash.gperf \ RequestMethod.cc \ RequestMethod.h \ StatusCode.cc \ @@ -35,7 +34,11 @@ MethodType.cc: MethodType.h $(top_srcdir)/src/mk-string-arrays.awk ($(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk sbuf=1 < $(srcdir)/MethodType.h | \ sed -e 's%METHOD_%%' -e 's%_C%-C%' >$@) || ($(RM) -f $@ && exit 1) -RegisteredHeadersHash.cci: RegisteredHeadersHash.gperf - gperf --output-file=$@ -m 100000 $< - CLEANFILES += MethodType.cc + +gperf-files: RegisteredHeadersHash.gperf + if test $(srcdir)/RegisteredHeadersHash.gperf -nt $(srcdir)/RegisteredHeadersHash.cci; then gperf --output-file=$(srcdir)/RegisteredHeadersHash.cci -m 100000 $(srcdir)/RegisteredHeadersHash.gperf; fi + +EXTRA_DIST = RegisteredHeadersHash.gperf + +.PHONY: gperf-files -- 2.47.2