diff --git a/doc/files/Makefile.am b/doc/files/Makefile.am index e046c420..07de20a9 100644 --- a/doc/files/Makefile.am +++ b/doc/files/Makefile.am @@ -10,7 +10,7 @@ man5_MANS = pkcs15-profile.5 opensc.conf.5 endif opensc.conf.5.xml opensc.conf.5: $(srcdir)/opensc.conf.5.xml.in - sed \ + @sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@docdir[@]|$(docdir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \ @@ -19,14 +19,14 @@ opensc.conf.5.xml opensc.conf.5: $(srcdir)/opensc.conf.5.xml.in -e 's|@PROFILE_DIR_DEFAULT[@]|$(PROFILE_DIR_DEFAULT)|g' \ -e 's|@DEFAULT_SM_MODULE[@]|$(DEFAULT_SM_MODULE)|g' \ < $< > opensc.conf.5.xml - $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl opensc.conf.5.xml + $(AM_V_GEN)$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl opensc.conf.5.xml 2>/dev/null files.html: $(srcdir)/files.xml $(wildcard $(srcdir)/*.5.xml) opensc.conf.5.xml - $(XSLTPROC) --nonet --path "$(builddir):$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $< + $(AM_V_GEN)$(XSLTPROC) --nonet --path "$(builddir):$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $< 2>/dev/null %.5: $(srcdir)/%.5.xml - sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \ - | $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $< + $(AM_V_GEN)sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \ + | $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $< 2>/dev/null clean-local: -rm -rf $(html_DATA) $(man5_MANS) opensc.conf.5.xml diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am index 2c095321..ac443f71 100644 --- a/doc/tools/Makefile.am +++ b/doc/tools/Makefile.am @@ -14,15 +14,14 @@ endif completion_DATA = $(patsubst $(srcdir)/%.1.xml, %, $(wildcard $(srcdir)/*.1.xml)) tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) - $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $< + $(AM_V_GEN)$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $< 2>/dev/null %.1: $(srcdir)/%.1.xml - sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \ - | $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $< + $(AM_V_GEN)sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \ + | $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $< 2>/dev/null %: $(srcdir)/%.1.xml - @echo $< $@ - @cat $(srcdir)/completion-template \ + $(AM_V_GEN)cat $(srcdir)/completion-template \ | sed "s,ALLOPTS,\ $(shell sed -n 's,.*.*,\1,pg' $< \ | sort -u | grep -- '^\-' | tr '\n' ' ')," \ diff --git a/etc/Makefile.am b/etc/Makefile.am index 04bbc203..302e8500 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -17,7 +17,7 @@ force: opensc.conf.example: opensc.conf.example.in force .in: - @sed \ + $(AM_V_GEN)sed \ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@DEBUG_FILE[@]|$(DEBUG_FILE)|g' \ -e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \ diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 5689bb78..b0e659fe 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -140,9 +140,9 @@ endif .PHONY: cmdline cmdline: - for f in *.ggo.in; do $(do_subst) < "$$f" > "$${f%.in}"; done - for f in *.ggo; do $(GENGETOPT) --file-name="$${f%.ggo}-cmdline" --output-dir=$(builddir) < "$$f"; done - $(GENGETOPT) --file-name=opensc-asn1-cmdline --output-dir=$(builddir) < opensc-asn1.ggo --unamed-opts + @for f in *.ggo.in; do $(do_subst) < "$$f" > "$${f%.in}"; done + @for f in *.ggo; do $(GENGETOPT) --file-name="$${f%.ggo}-cmdline" --output-dir=$(builddir) < "$$f"; done + $(AM_V_GEN)$(GENGETOPT) --file-name=opensc-asn1-cmdline --output-dir=$(builddir) < opensc-asn1.ggo --unamed-opts if WIN32 opensc_tool_SOURCES += versioninfo-tools.rc @@ -174,12 +174,12 @@ xdg_autostart_DATA = pkcs11-register.desktop endif %.desktop: %.desktop.in - $(do_subst) < $< > $@ + $(AM_V_GEN)$(do_subst) < $< > $@ noinst_DATA = org.opensc-project.mac.pkcs11-register.plist org.opensc-project.mac.opensc-notify.plist %.plist: %.plist.in - $(do_subst) < $< > $@ + $(AM_V_GEN)$(do_subst) < $< > $@ clean-local: rm -f $(abs_builddir)/npa-tool.ggo $(abs_builddir)/opensc-notify.ggo $(abs_builddir)/opensc-asn1.ggo $(abs_builddir)/goid-tool.ggo $(abs_builddir)/egk-tool.ggo org.opensc.notify.desktop pkcs11-register.desktop