Move gperf invocation for RegisteredHeadersHash to source-maintenance.sh

Portability fixes for non-GNU make.

diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index 9f0a0da2bcc68b035a698118f211b6cf453b0339..c4548a7e8f1733dc61daa1e806d218a344b74601 100755 (executable)
--- 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 03cff1ef68f2879115b19fbac2125c9eef30578d..93a52b2477d0eb0dcd0ca20a1862d44a446fc7f6 100644 (file)
--- 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