From 5abc01cf70565741080cc3bb079f93f6ea861cc7 Mon Sep 17 00:00:00 2001 From: David Ward Date: Sat, 11 Apr 2020 10:09:27 -0400 Subject: [PATCH] Respect Automake silent mode in custom rules --- ccid/src/Makefile.am | 6 +++--- pcsc-relay/src/Makefile.am | 6 +++--- virtualsmartcard/src/pcsclite-vpcd/Makefile.am | 2 +- virtualsmartcard/src/vpicc/Makefile.am | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am index 91ee927..85e9b81 100644 --- a/ccid/src/Makefile.am +++ b/ccid/src/Makefile.am @@ -23,14 +23,14 @@ ccid_emulator_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/src/O ccid-emulator.c: $(BUILT_SOURCES) $(BUILT_SOURCES): ccid-emulator.ggo - $(GENGETOPT) --output-dir=$(srcdir) < $< + $(AM_V_GEN)$(GENGETOPT) --output-dir=$(srcdir) < $< ccid-emulator.ggo: ccid-emulator.ggo.in - $(do_subst) < $< > $(srcdir)/$@ + $(AM_V_GEN)$(do_subst) < $< > $(srcdir)/$@ ccid-emulator.1: - $(HELP2MAN) \ + $(AM_V_GEN)$(HELP2MAN) \ --output=$@ \ --no-info \ --source='$(PACKAGE_STRING)' \ diff --git a/pcsc-relay/src/Makefile.am b/pcsc-relay/src/Makefile.am index 18ff3ba..21a92c8 100644 --- a/pcsc-relay/src/Makefile.am +++ b/pcsc-relay/src/Makefile.am @@ -16,7 +16,7 @@ dist_man1_MANS = pcsc-relay.1 pcsc-relay.1: - $(HELP2MAN) \ + $(AM_V_GEN)$(HELP2MAN) \ --output=$@ \ --no-info \ --no-discard-stderr \ @@ -40,7 +40,7 @@ noinst_HEADERS = pcsc-relay.h vpcd.h lock.h pcsc-relay.c: $(BUILT_SOURCES) $(BUILT_SOURCES): pcsc-relay.ggo - $(GENGETOPT) --output-dir=$(srcdir) < $< + $(AM_V_GEN)$(GENGETOPT) --output-dir=$(srcdir) < $< pcsc-relay.ggo: pcsc-relay.ggo.in - $(do_subst) < $< > $(srcdir)/$@ + $(AM_V_GEN)$(do_subst) < $< > $(srcdir)/$@ diff --git a/virtualsmartcard/src/pcsclite-vpcd/Makefile.am b/virtualsmartcard/src/pcsclite-vpcd/Makefile.am index fa9f9cb..4165fe3 100644 --- a/virtualsmartcard/src/pcsclite-vpcd/Makefile.am +++ b/virtualsmartcard/src/pcsclite-vpcd/Makefile.am @@ -18,7 +18,7 @@ nobase_include_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libpcsclite.pc libpcsclite.pc: libpcsclite.pc.in - $(do_subst) < $(srcdir)/libpcsclite.pc.in > libpcsclite.pc + $(AM_V_GEN)$(do_subst) < $(srcdir)/libpcsclite.pc.in > libpcsclite.pc do_subst = $(SED) \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ diff --git a/virtualsmartcard/src/vpicc/Makefile.am b/virtualsmartcard/src/vpicc/Makefile.am index add04c1..22cf7b6 100644 --- a/virtualsmartcard/src/vpicc/Makefile.am +++ b/virtualsmartcard/src/vpicc/Makefile.am @@ -34,11 +34,11 @@ do_subst = $(SED) \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' $(builddir)/vicc: vicc.in Makefile - $(do_subst) < $(srcdir)/vicc.in > $(builddir)/vicc - chmod +x $(builddir)/vicc + $(AM_V_GEN)$(do_subst) < $(srcdir)/vicc.in > $(builddir)/vicc + @chmod +x $(builddir)/vicc vicc.1: vicc.in - $(HELP2MAN) \ + $(AM_V_GEN)$(HELP2MAN) \ --no-discard-stderr \ --output=$@ \ $(builddir)/vicc