From 6b5dc8deb0c8c89c311059f080aff4d727e60b26 Mon Sep 17 00:00:00 2001 From: Petr Pavlu Date: Sat, 25 Feb 2017 12:23:07 +0000 Subject: [PATCH] Use $(AM_V_GEN) and $(AM_V_at) as appropriate --- Makefile.am | 14 +++++++++----- doc/Makefile.am | 4 ++-- src/Makefile.am | 5 +++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index c0aa06a..3cc4127 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,16 +13,20 @@ BUILT_SOURCES = $(top_srcdir)/.version # We want to execute this target everytime make is run. .PHONY: $(top_srcdir)/.version $(top_srcdir)/.version: - @cd $(top_srcdir); version=`misc/git-version-gen .tarball-version`; \ - if test "$$version" != "`cat .version 2> /dev/null`"; then printf '%s' "$$version" > .version; fi + $(AM_V_at)cd $(top_srcdir); \ + version=`misc/git-version-gen .tarball-version`; \ + if test "$$version" != "`cat .version 2> /dev/null`"; then \ + printf '%s' "$$version" > .version; \ + fi dist-hook: - @cd $(top_srcdir); misc/git-version-gen .tarball-version > .tarball-version - @mv $(top_srcdir)/.tarball-version $(top_distdir) + $(AM_V_at)cd $(top_srcdir); misc/git-version-gen .tarball-version \ + > .tarball-version + $(AM_V_at)mv $(top_srcdir)/.tarball-version $(top_distdir) .PHONY: doc doc: - cd doc; $(MAKE) doc + $(AM_V_at)cd doc; $(MAKE) doc # Package in all cmake files. EXTRA_DIST += \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 2c72eae..be08528 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ .PHONY: doc doc: - doxygen doxygen-cppconsui.conf > /dev/null - @echo "open doc/html/index.html" + $(AM_V_GEN)doxygen doxygen-cppconsui.conf > /dev/null + @echo "Open doc/html/index.html." diff --git a/src/Makefile.am b/src/Makefile.am index 3ae5759..2564964 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,5 +59,6 @@ centerim5_LDADD = \ git-version.cpp: git-version.h -git-version.h : $(top_srcdir)/.version git-version.h.in - @sed -e "s/@GIT_VERSION@/`cat $(top_srcdir)/.version`/" < $(srcdir)/git-version.h.in > git-version.h +git-version.h: $(top_srcdir)/.version git-version.h.in + $(AM_V_GEN)sed -e "s/@GIT_VERSION@/`cat $(top_srcdir)/.version`/" \ + < $(srcdir)/git-version.h.in > git-version.h -- 2.11.4.GIT