build: hide maintainer tool invocation behind AM_V_GEN

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/.x-sc_makefile_at_at_check b/.x-sc_makefile_at_at_check
new file mode 100644 (file)
index 0000000..ead7fb0
--- /dev/null
+++ b/.x-sc_makefile_at_at_check
@@ -0,0 +1 @@
+^lib/common.mk

diff --git a/configure.ac b/configure.ac
index 26c890e2c56666561dc5538125d3759381f7b316..a4f8c183ae69b36e783926a8bbe9333778931afc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,9 @@ AX_CODE_COVERAGE
 
 AM_MAINTAINER_MODE([enable])
 
+AM_MISSING_PROG([GPERF], [gperf])
+AM_MISSING_PROG([ASN1PARSER], [asn1Parser])
+
 AC_ARG_ENABLE(bash-tests,
   AS_HELP_STRING([--disable-bash-tests], [skip some tests that badly need bash]),
     enable_bash_tests=$enableval, enable_bash_tests=yes)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 50cd3dbf7c1dd223907a25b9ee68d8b2011f7a54..35df35ee8da28e07445fc30d521d8cc29b49afd8 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -259,12 +259,12 @@ libgnutlsxx_la_LIBADD = libgnutls.la
 endif
 
 pkix_asn1_tab.c: $(srcdir)/pkix.asn
-       -asn1Parser $(srcdir)/pkix.asn pkix_asn1_tab.c
+       $(AM_V_GEN)$(ASN1PARSER) $(srcdir)/pkix.asn pkix_asn1_tab.c
 
 gnutls_asn1_tab.c: $(srcdir)/gnutls.asn
-       -asn1Parser $(srcdir)/gnutls.asn gnutls_asn1_tab.c
+       $(AM_V_GEN)$(ASN1PARSER) $(srcdir)/gnutls.asn gnutls_asn1_tab.c
 
 priority_options.h: $(srcdir)/priority_options.gperf
-       -gperf --global-table -t $^ > $@-tmp \
+       $(V_GPERF)$(GPERF) --global-table -t $^ > $@-tmp \
        && sed 's/^const struct priority_options_st \*/static const struct priority_options_st \*/' <$@-tmp >$@ \
        && rm -f $@-tmp

diff --git a/lib/common.mk b/lib/common.mk
index 6a1b7855d6af03261b3c71139dfd81535ad92e6a..796fdf30bdc87cef58427e51ea07722fbd195d1d 100644 (file)
--- a/lib/common.mk
+++ b/lib/common.mk
@@ -1,3 +1,7 @@
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) \
   $(LIBTASN1_CFLAGS) $(LIBIDN2_CFLAGS) $(P11_KIT_CFLAGS) $(CODE_COVERAGE_CFLAGS)
 COMMON_LINK_FLAGS = $(CODE_COVERAGE_LDFLAGS)
+
+V_GPERF = $(V_GPERF_@AM_V@)
+V_GPERF_ = $(V_GPERF_@AM_DEFAULT_V@)
+V_GPERF_0 = @echo "  GPERF   " $@;

diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 63b2b849b427e7ffdd8454425a6326dc4177763c..5caf8f87f9bbbb08cf0d92dd60a9690364378c42 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -86,6 +86,6 @@ libgnutls_x509_la_SOURCES += ocsp.c ocsp_output.c
 endif
 
 supported_exts.h: $(srcdir)/supported_exts.gperf
-       -gperf --global-table -t $^ > $@-tmp \
+       $(V_GPERF)$(GPERF) --global-table -t $^ > $@-tmp \
        && sed 's/^const struct supported_exts_st \*/static const struct supported_exts_st \*/' <$@-tmp >$@ \
        && rm -f $@-tmp