diff options
| author | Daiki Ueno <ueno@gnu.org> | 2022-01-16 16:48:14 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2022-01-16 16:48:14 +0000 |
| commit | 0a673a028506c6bff961c41992fb25baa1a11509 (patch) | |
| tree | f68b4d6970db214e4caf7cc5cdea8f72a11cb4a4 /lib | |
| parent | 6000b2d93b6cb9acd45adc9b4d8f7bf2f1cb49b2 (diff) | |
| parent | 1b06c7fef0cea21e4f7094f89cd2649c55361413 (diff) | |
| download | gnutls-0a673a028506c6bff961c41992fb25baa1a11509.tar.gz | |
Merge branch 'wip/dueno/build-fixes3' into 'master'
Minor build fixes for 3.7.3 release (part 2)
See merge request gnutls/gnutls!1516
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/common.mk | 4 | ||||
| -rw-r--r-- | lib/x509/Makefile.am | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 50cd3dbf7c..35df35ee8d 100644 --- 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 6a1b7855d6..796fdf30bd 100644 --- 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 63b2b849b4..5caf8f87f9 100644 --- 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 |