makefiles: use SHOW

base/Makefile

@@ -31,7 +31,7 @@ CLEAN_TARGETS += $(BASE_DEPENDS) $(BASE_OBJECTS) \
 	$(BASE_TARGET)
 
 $(BASE_TARGET): $(BASE_OBJECTS)
-	@echo "    [AR] $@"
+	$(SHOW) "    [AR] $@"
 	$(Q) $(RM) $@
 	$(Q) $(AR) rsv $@ $(BASE_OBJECTS) > /dev/null
 

conf/Makefile.in

@@ -49,7 +49,7 @@ install_localconf: $(CONFLOCAL)
 	fi
 
 install_profiles: $(PROFILES)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DIR) $(profiledir)
 	$(Q) $(INSTALL_DATA) $(PROFILES) $(profiledir)/
 

daemons/cmirrord/Makefile.in

@@ -32,12 +32,12 @@ CFLAGS += $(CPG_CFLAGS) $(EXTRA_EXEC_CFLAGS)
 LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
 
 cmirrord: $(OBJECTS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
 		$(LMLIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS)
 
 install_cluster: $(TARGETS)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(usrsbindir)/$(<F)
 
 install: install_cluster

daemons/dmeventd/Makefile.in

@@ -70,12 +70,12 @@ plugins.device-mapper: $(LIB_SHARED)
 CFLAGS_dmeventd.o += $(EXTRA_EXEC_CFLAGS)
 
 dmeventd: $(LIB_SHARED) dmeventd.o
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) dmeventd.o \
 		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS)
 
 dmeventd.static: $(LIB_STATIC) dmeventd.o
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static dmeventd.o \
 		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS)
 
@@ -84,27 +84,27 @@ ifeq ("@PKGCONFIG@", "yes")
 endif
 
 install_include: $(srcdir)/libdevmapper-event.h
-	@echo "    [INSTALL] $(<F)"
+	$(SHOW) "    [INSTALL] $(<F)"
 	$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
 
 install_pkgconfig: libdevmapper-event.pc
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper-event.pc
 
 install_lib_dynamic: install_lib_shared
 
 install_lib_static: $(LIB_STATIC)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
 
 install_lib: $(INSTALL_LIB_TARGETS)
 
 install_dmeventd_dynamic: dmeventd
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install_dmeventd_static: dmeventd.static
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
 
 install_dmeventd: $(INSTALL_DMEVENTD_TARGETS)

daemons/lvmdbusd/Makefile.in

@@ -52,7 +52,7 @@ include $(top_builddir)/make.tmpl
 .PHONY: install_lvmdbusd
 
 install_lvmdbusd: $(LVMDBUSD)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DIR) $(sbindir)
 	$(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
 	$(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__

daemons/lvmlockd/Makefile.in

@@ -56,19 +56,19 @@ ifneq (,$(firstword $(LIBSYSTEMD_LIBS)))
 endif
 
 lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LOCK_LIBS) $(LIBS)
 
 lvmlockctl: lvmlockctl.o $(INTERNAL_LIBS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
 
 install_lvmlockd: lvmlockd
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install_lvmlockctl: lvmlockctl
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install_lvm2: install_lvmlockd install_lvmlockctl

daemons/lvmpolld/Makefile.in

@@ -32,11 +32,11 @@ LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
 LIBS += $(DAEMON_LIBS) $(PTHREAD_LIBS)
 
 lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
 
 install_lvmpolld: lvmpolld
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install_lvm2: install_lvmpolld

device_mapper/Makefile

@@ -44,7 +44,7 @@ CLEAN_TARGETS += $(DEVICE_MAPPER_DEPENDS) $(DEVICE_MAPPER_OBJECTS) \
 #$(DEVICE_MAPPER_OBJECTS): INCLUDES+=$(VDO_INCLUDES)
 
 $(DEVICE_MAPPER_TARGET): $(DEVICE_MAPPER_OBJECTS)
-	@echo "    [AR] $@"
+	$(SHOW) "    [AR] $@"
 	$(Q) $(RM) $@
 	$(Q) $(AR) rsv $@ $(DEVICE_MAPPER_OBJECTS) > /dev/null
 

include/Makefile.in

@@ -20,7 +20,7 @@ include $(top_builddir)/make.tmpl
 
 .DELETE_ON_ERROR:
 cmds.h: $(top_srcdir)/tools/command-lines.in $(top_srcdir)/tools/license.inc Makefile
-	@echo "    [GEN] $@"
+	$(SHOW) "    [GEN] $@"
 	$(Q) \
 	( cat $(top_srcdir)/tools/license.inc && \
 	  echo "/* Do not edit. This file is generated by the Makefile. */" && \

libdm/Makefile.in

@@ -66,13 +66,13 @@ device-mapper: $(TARGETS)
 dm-tools.device-mapper: device-mapper
 
 libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION): $(LIB_SHARED)
-	@echo "    [LN] $<"
+	$(SHOW) "    [LN] $<"
 	$(Q) $(LN_S) -f $< $@
 
 # Check versioned build when default versioned symbol is present @@
 # also the older symbol is built-in
 .symver_check: $(LIB_SHARED)
-	@echo "    [CHECK] $<"
+	$(SHOW) "    [CHECK] $<"
 	$(Q) if $(READELF) -Ws $< | grep -q dm_stats_create_region@@; then \
 	SYM=$$($(READELF) -Ws $< | grep dm_stats_create_region@DM_1_02_106); \
 	if test -n "$$SYM"; then touch $@; \
@@ -98,7 +98,7 @@ install: $(INSTALL_TYPE) install_include
 install_device-mapper: install
 
 install_include: $(srcdir)/libdevmapper.h
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
 
 install_dynamic: install_@interface@
@@ -113,11 +113,11 @@ install_ioctl: install_ioctl_static
 endif
 
 install_pkgconfig: libdevmapper.pc
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc
 
 install_ioctl_static: $(LIB_STATIC)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
 
 CLEAN_TARGETS += ioctl/libdevmapper.a

libdm/dm-tools/Makefile.in

@@ -62,42 +62,42 @@ LIBDM_SHARED = $(interfacebuilddir)/libdevmapper.so
 LIBDM_STATIC = $(interfacebuilddir)/libdevmapper.a
 
 dmsetup: dmsetup.o $(LIBDM_SHARED)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
 	      -o $@ $< $(LIBDM_LIBS) $(LIBS)
 
 dmsetup.static: dmsetup.o $(LIBDM_STATIC)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static \
 	      -o $@ $< $(LIBDM_LIBS) $(LIBS) $(STATIC_LIBS)
 
 install_dmsetup_dynamic: dmsetup
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 	$(Q) $(LN_S) -f $(<F) $(sbindir)/dmstats
 
 install_dmsetup_static: dmsetup.static
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
 	$(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats.static
 
 
 dmfilemapd: dmfilemapd.o $(LIBDM_SHARED)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
 	      -o $@ $< $(LIBDM_LIBS) $(LIBS)
 
 dmfilemapd.static: dmfilemapd.o $(LIBDM_STATIC)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static \
 	      -o $@ $< $(LIBDM_LIBS) $(LIBS) $(STATIC_LIBS)
 
 install_dmfilemapd_dynamic: dmfilemapd
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 
 install_dmfilemapd_static: dmfilemapd.static
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
 
 

libdm/make.tmpl.in

@@ -418,29 +418,29 @@ DEPFLAGS=-MT $@ -MMD -MP -MF $*.d
 DEFS+=-D_FILE_OFFSET_BITS=64
 
 %.o: %.c $(DEPS)
-	@echo "    [CC] $(<F)"
+	$(SHOW) "    [CC] $(<F)"
 	@mkdir -p $(@D)
 	$(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
 
 %.o: %.cpp $(DEPS)
-	@echo "    [CXX] $(<F)"
+	$(SHOW) "    [CXX] $(<F)"
 	@mkdir -p $(@D)
 	$(Q) $(CXX) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
 
 %.pot: %.c $(DEPS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	@mkdir -p $(@D)
 	$(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@
 
 %.so: %.o
-	@echo "    [CC] $(<F)"
+	$(SHOW) "    [CC] $(<F)"
 	$(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
 
 ifneq (,$(LIB_SHARED))
 
 TARGETS += $(LIB_SHARED).$(LIB_VERSION)
 $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 ifeq ("@LIB_SUFFIX@","so")
 	$(Q) $(CC) -shared -Wl,-soname,$(notdir $@) \
 		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
@@ -451,13 +451,13 @@ ifeq ("@LIB_SUFFIX@","dylib")
 endif
 
 $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
-	@echo "    [LN] $(<F)"
+	$(SHOW) "    [LN] $(<F)"
 	$(Q) $(LN_S) -f $(<F) $@
 
 CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated
 
 install_lib_shared: $(LIB_SHARED)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
 	$(Q) $(INSTALL_DIR) $(usrlibdir)
 	$(Q) $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
@@ -466,19 +466,19 @@ install_lib_shared: $(LIB_SHARED)
 #        and for compatibility links in libdir are created
 #        when the code is fixed links could be removed.
 install_dm_plugin: $(LIB_SHARED)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
 	$(Q) $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
 
 install_lvm2_plugin: $(LIB_SHARED)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
 	$(Q) $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
 	$(Q) $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
 endif
 
 $(LIB_STATIC): $(OBJECTS)
-	@echo "    [AR] $@"
+	$(SHOW) "    [AR] $@"
 	$(Q) $(RM) $@
 	$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
 
@@ -486,7 +486,7 @@ $(LIB_STATIC): $(OBJECTS)
 .PRECIOUS: %.d
 
 %.mo: %.po
-	@echo "    [MSGFMT] $(<F)"
+	$(SHOW) "    [MSGFMT] $(<F)"
 	$(Q) $(MSGFMT) -o $@ $<
 
 CLEAN_TARGETS += \
@@ -495,7 +495,7 @@ CLEAN_TARGETS += \
 	$(POTFILES) $(CLEAN_CFLOW)
 
 cleandir:
-	@echo "    [CLEANDIR]"
+	$(SHOW) "    [CLEANDIR]"
 ifneq (,$(firstword $(CLEAN_DIRS)))
 	$(Q) $(RM) -r $(CLEAN_DIRS)
 endif
@@ -504,7 +504,7 @@ endif
 clean: $(SUBDIRS.clean) cleandir
 
 distclean: cleandir $(SUBDIRS.distclean)
-	@echo "    [DISTCLEAN]"
+	$(SHOW) "    [DISTCLEAN]"
 ifneq (,$(firstword $(DISTCLEAN_DIRS)))
 	$(Q) $(RM) -r $(DISTCLEAN_DIRS)
 endif

make.tmpl.in

@@ -492,29 +492,29 @@ DEPFLAGS=-MT $@ -MMD -MP -MF $*.d
 DEFS+=-D_FILE_OFFSET_BITS=64
 
 %.o: %.c $(DEPS)
-	@echo "    [CC] $(<F)"
+	$(SHOW) "    [CC] $(<F)"
 	@mkdir -p $(@D)
 	$(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
 
 %.o: %.cpp $(DEPS)
-	@echo "    [CXX] $(<F)"
+	$(SHOW) "    [CXX] $(<F)"
 	@mkdir -p $(@D)
 	$(Q) $(CXX) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
 
 %.pot: %.c $(DEPS)
-	@echo "    [CC] $(<F)"
+	$(SHOW) "    [CC] $(<F)"
 	@mkdir -p $(@D)
 	$(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS)  $< >$@
 
 %.so: %.o
-	@echo "    [CC] $(<F)"
+	$(SHOW) "    [CC] $(<F)"
 	$(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
 
 ifneq (,$(LIB_SHARED))
 
 TARGETS += $(LIB_SHARED).$(LIB_VERSION)
 $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 ifeq ("@LIB_SUFFIX@","so")
 	$(Q) $(CC) -shared -Wl,-soname,$(notdir $@) \
 		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
@@ -525,13 +525,13 @@ ifeq ("@LIB_SUFFIX@","dylib")
 endif
 
 $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
-	@echo "    [LN] $@"
+	$(SHOW) "    [LN] $@"
 	$(Q) $(LN_S) -f $(<F) $@
 
 CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated
 
 install_lib_shared: $(LIB_SHARED)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
 	$(Q) $(INSTALL_DIR) $(usrlibdir)
 	$(Q) $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
@@ -540,19 +540,19 @@ install_lib_shared: $(LIB_SHARED)
 #        and for compatibility links in libdir are created
 #        when the code is fixed links could be removed.
 install_dm_plugin: $(LIB_SHARED)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
 	$(Q) $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
 
 install_lvm2_plugin: $(LIB_SHARED)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
 	$(Q) $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
 	$(Q) $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
 endif
 
 $(LIB_STATIC): $(OBJECTS)
-	@echo "    [AR] $@"
+	$(SHOW) "    [AR] $@"
 	$(Q) $(RM) $@
 	$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
 
@@ -560,7 +560,7 @@ $(LIB_STATIC): $(OBJECTS)
 .PRECIOUS: %.d
 
 %.mo: %.po
-	@echo "    [MSGFMT] $(<F)"
+	$(SHOW) "    [MSGFMT] $(<F)"
 	$(Q) $(MSGFMT) -o $@ $<
 
 CLEAN_TARGETS += \
@@ -569,7 +569,7 @@ CLEAN_TARGETS += \
 	$(POTFILES) $(CLEAN_CFLOW)
 
 cleandir:
-	@echo "    [CLEANDIR]"
+	$(SHOW) "    [CLEANDIR]"
 ifneq (,$(firstword $(CLEAN_DIRS)))
 	$(Q) $(RM) -r $(CLEAN_DIRS)
 endif
@@ -578,7 +578,7 @@ endif
 clean: $(SUBDIRS.clean) cleandir
 
 distclean: cleandir $(SUBDIRS.distclean)
-	@echo "    [DISTCLEAN]"
+	$(SHOW) "    [DISTCLEAN]"
 ifneq (,$(firstword $(DISTCLEAN_DIRS)))
 	$(Q) $(RM) -r $(DISTCLEAN_DIRS)
 endif

man/Makefile.in

@@ -133,12 +133,12 @@ all_man: man
 $(MAN5) $(MAN7) $(MAN8) $(MAN8SO) $(MAN8DM) $(MAN8CLUSTER): Makefile
 
 $(MANGENERATOR):
-	@echo "    [MAKE] $<"
+	$(SHOW) "    [MAKE] $<"
 	$(Q) $(MAKE) -C $(top_builddir) tools
 
 # Test whether or not the man page generator works
 $(TESTMAN): $(MANGENERATOR) Makefile
-	@echo "    [TSTMAN] $@"
+	$(SHOW) "    [TSTMAN] $@"
 	$(Q) - $(MANGENERATOR) --primary lvmconfig > $@
 
 SEE_ALSO=$(srcdir)/see_also.end
@@ -238,41 +238,41 @@ checksed:
 	$(Q) $(RM) $@ $@-e
 
 %.5: $(srcdir)/%.5_main
-	@echo "    [MAN] $@"
+	$(SHOW) "    [MAN] $@"
 	$(Q) $(SUBSTVARS)
 	$(Q) $(ESCAPEHYPHENS)
 
 %.7: $(srcdir)/%.7_main
-	@echo "    [MAN] $@"
+	$(SHOW) "    [MAN] $@"
 	$(Q) $(SUBSTVARS)
 	$(Q) $(ESCAPEHYPHENS)
 
 %.8: $(srcdir)/%.8_main
-	@echo "    [MAN] $@"
+	$(SHOW) "    [MAN] $@"
 	$(Q) $(SUBSTVARS)
 	$(Q) $(ESCAPEHYPHENS)
 
 %.8: %.8_gen
-	@echo "    [MAN] $@"
+	$(SHOW) "    [MAN] $@"
 	$(Q) $(SUBSTVARS)
 	$(Q) $(ESCAPEHYPHENS)
 
 $(MAN8SO): lvmconfig.8
-	@echo "    [MAN] $@"
+	$(SHOW) "    [MAN] $@"
 	$(Q) echo ".so $<" > $@
 
 install_man5: $(MAN5)
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL) -d $(MAN5DIR)
 	$(Q) $(INSTALL_DATA) $^ $(MAN5DIR)/
 
 install_man7: $(MAN7)
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL) -d $(MAN7DIR)
 	$(Q) $(INSTALL_DATA) $^ $(MAN7DIR)/
 
 install_man8: $(MAN8) $(MAN8SO)
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL) -d $(MAN8DIR)
 	$(Q) $(INSTALL_DATA) $^ $(MAN8DIR)/
 
@@ -280,13 +280,13 @@ install_lvm2: install_man5 install_man7 install_man8
 
 install_cluster: $(MAN8CLUSTER)
 ifdef MAN8CLUSTER
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL) -d $(MAN8DIR)
 	$(Q) $(INSTALL_DATA) $^ $(MAN8DIR)/
 endif
 
 install_device-mapper: $(MAN8DM)
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL) -d $(MAN8DIR)
 	$(Q) $(INSTALL_DATA) $^ $(MAN8DIR)/
 
@@ -296,7 +296,7 @@ install_all_man: install install_systemd_generators
 
 # Copy generated man pages back to source tree as fallback for machines where generator doesn't work
 pregenerated_man: $(MANGENERATOR) $(TESTMAN)
-	@echo "    [GENERATE] $^"
+	$(SHOW) "    [GENERATE] $^"
 	$(Q) set -e ; test -s $(TESTMAN) && for i in $(srcdir)/*.8_des; do \
 		CMD=`basename $$i .8_des`; \
 		( $(MANGENERATOR) --primary $$CMD $$i && \

scripts/Makefile.in

@@ -45,11 +45,11 @@ vpath %.sh $(srcdir)
 vpath %.ocf $(srcdir)
 
 %_install: %.sh
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F))
 
 %_install: %.ocf
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL_DIR) $(ocf_scriptdir)
 	$(Q) $(INSTALL_SCRIPT) $< $(ocf_scriptdir)/$(basename $(<F))
 
@@ -59,7 +59,7 @@ install_device-mapper: $(DM_SCRIPTS:.sh=_install)
 install_ocf: $(OCF_SCRIPTS:.ocf=_install)
 
 install_libexec: lvresize_fs_helper.sh
-	@echo "    [INSTALL] $^"
+	$(SHOW) "    [INSTALL] $^"
 	$(Q) $(INSTALL_DIR) $(libexecdir)
 	$(Q) $(INSTALL_SCRIPT) $< $(libexecdir)/$(basename $(<F))
 
@@ -68,7 +68,7 @@ install: install_lvm2 install_ocf install_device-mapper
 
 # FIXME Customise for other distributions
 install_initscripts:
-	@echo "    [INSTALL] initscripts"
+	$(SHOW) "    [INSTALL] initscripts"
 	$(Q) $(INSTALL_DIR) $(initdir)
 ifeq ("@BUILD_DMEVENTD@", "yes")
 	$(Q) $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(initdir)/lvm2-monitor
@@ -84,7 +84,7 @@ ifeq ("@BLKDEACTIVATE@", "yes")
 endif
 
 install_systemd_units:	install_dbus_service
-	@echo "    [INSTALL] systemd_units"
+	$(SHOW) "    [INSTALL] systemd_units"
 	$(Q) $(INSTALL_DIR) $(systemd_unit_dir)
 ifeq ("@BUILD_DMEVENTD@", "yes")
 	$(Q) $(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_unit_dir)/dm-event.socket
@@ -111,7 +111,7 @@ endif
 
 ifeq ("@BUILD_LVMDBUSD@", "yes")
 install_dbus_service:
-	@echo "    [INSTALL] dbus_service"
+	$(SHOW) "    [INSTALL] dbus_service"
 	$(Q) $(INSTALL_DIR) $(dbusconfdir)
 	$(Q) $(INSTALL_DIR) $(dbusservicedir)
 	$(Q) $(INSTALL_DATA) $(top_srcdir)/scripts/com.redhat.lvmdbus1.conf $(dbusconfdir)
@@ -121,7 +121,7 @@ install_systemd_units:	install_dbus_service
 endif
 
 install_tmpfiles_configuration:
-	@echo "    [INSTALL] configuration"
+	$(SHOW) "    [INSTALL] configuration"
 	$(Q) $(INSTALL_DIR) $(tmpfiles_dir)
 	$(Q) $(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf
 

test/unit/Makefile

@@ -45,7 +45,7 @@ lib/liblvm-internal.a: lib
 libdaemon/client/libdaemonclient.a: libdaemon
 
 $(UNIT_TARGET): $(UNIT_OBJECTS) $(LVMINTERNAL_LIBS)
-	@echo "    [LD] $@"
+	$(SHOW) "    [LD] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \
 	      -o $@ $+ $(LVMLIBS)
 

tools/Makefile.in

@@ -123,54 +123,54 @@ all: device-mapper
 CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
 
 lvm: $(OBJECTS) lvm.o $(LVMINTERNAL_LIBS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
 		-o $@ $+ $(LVMLIBS)
 
 DEFS_man-generator.o += -DMAN_PAGE_GENERATOR
 
 man-generator.c: $(srcdir)/command.c
-	@echo "    [LN] $@"
+	$(SHOW) "    [LN] $@"
 	$(Q) $(LN_S) -f $< $(@F)
 
 man-generator: man-generator.o
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(<F)
 
 lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
 		-o $@ $+ $(LVMLIBS) $(STATIC_LIBS)
 
 liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
-	@echo "    [AR] $@"
+	$(SHOW) "    [AR] $@"
 	$(Q) cat $(top_builddir)/lib/liblvm-internal.a > $@
 	$(Q) $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd.o > /dev/null
 
 liblvm2cmd-static.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
-	@echo "    [AR] $@"
+	$(SHOW) "    [AR] $@"
 	$(Q) cat $(top_builddir)/lib/liblvm-internal.a > $@
 	$(Q) $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o > /dev/null
 
 liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
-	@echo "    [CC] $@"
+	$(SHOW) "    [CC] $@"
 	$(Q) $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
 		$(CFLAGS) $(CLDFLAGS) -o $@ \
 		@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ \
 		$(INTERNAL_LIBS) $(LVMLIBS)
 
 liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
-	@echo "    [LN] $@"
+	$(SHOW) "    [LN] $@"
 	$(Q) $(LN_S) -f $< $@
 
 .commands: $(srcdir)/cmdnames.h $(srcdir)/commands.h Makefile
-	@echo "    [CC] $(<F)"
+	$(SHOW) "    [CC] $(<F)"
 	$(Q) $(CC) -E -P $< 2> /dev/null | \
 		$(EGREP) -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvmchange|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
 
 .DELETE_ON_ERROR:
 command-count.h: $(srcdir)/command-lines.in $(srcdir)/license.inc Makefile
-	@echo "    [GEN] $@"
+	$(SHOW) "    [GEN] $@"
 	$(Q) \
 	( cat $(srcdir)/license.inc && \
 	  echo "/* Do not edit. This file is generated by the Makefile. */" && \
@@ -180,7 +180,7 @@ command-count.h: $(srcdir)/command-lines.in $(srcdir)/license.inc Makefile
 
 .DELETE_ON_ERROR:
 command-lines-input.h: $(srcdir)/command-lines.in $(srcdir)/license.inc Makefile
-	@echo "    [GEN] $@"
+	$(SHOW) "    [GEN] $@"
 	$(Q) \
 	( cat $(srcdir)/license.inc && \
 	  echo "/* Do not edit. This file is generated by the Makefile. */" && \
@@ -197,21 +197,21 @@ lvm.cflow lvm.xref lvm.tree lvm.xref: command-lines-input.h command-count.h
 	install_tools_dynamic install_tools_static
 
 install_cmdlib_include: $(srcdir)/lvm2cmd.h
-	@echo "    [INSTALL] $(<F)"
+	$(SHOW) "    [INSTALL] $(<F)"
 	$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
 
 install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
 	$(Q) $(INSTALL_DIR) $(usrlibdir)
 	$(Q) $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
 
 install_cmdlib_static: liblvm2cmd-static.a
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a
 
 install_tools_dynamic: lvm .commands
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
 	@echo Creating symbolic links for individual commands in $(sbindir)
 	@cat .commands | while read v ; do \
@@ -220,7 +220,7 @@ install_tools_dynamic: lvm .commands
 	done
 
 install_tools_static: lvm.static
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
 
 install_lvm2: $(INSTALL_LVM_TARGETS)

udev/Makefile.in

@@ -47,7 +47,7 @@ endif
 	$(Q) $(SED) -e "s+(DM_DIR)+$(DM_DIR)+;s+(SYSTEMDRUN)+$(SYSTEMDRUN)+;s+(BLKID_RULE)+$(BLKID_RULE)+;s+(DM_EXEC_RULE)+$(DM_EXEC_RULE)+;s+(DM_EXEC)+$(DM_EXEC)+;s+(LVM_EXEC_RULE)+$(LVM_EXEC_RULE)+;s+(LVM_EXEC)+$(LVM_EXEC)+;" $< >$@
 
 %_install: %.rules
-	@echo "    [INSTALL] $<"
+	$(SHOW) "    [INSTALL] $<"
 	$(Q) $(INSTALL_DATA) -D $< $(udevdir)/$(<F)
 
 all: $(DM_RULES) $(LVM_RULES)