diff --git a/base/Makefile b/base/Makefile index 9f8bccca6..2e4082a54 100644 --- a/base/Makefile +++ b/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 diff --git a/conf/Makefile.in b/conf/Makefile.in index ee3b032e4..708f48efc 100644 --- a/conf/Makefile.in +++ b/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)/ diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index 8f68ba91c..29c7efcd6 100644 --- a/daemons/cmirrord/Makefile.in +++ b/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)/$( /dev/null diff --git a/include/Makefile.in b/include/Makefile.in index 60b93f495..75f0804ad 100644 --- a/include/Makefile.in +++ b/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. */" && \ diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 8bf1eacfc..e38317325 100644 --- a/libdm/Makefile.in +++ b/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)/$($@ %.so: %.o - @echo " [CC] $( /dev/null @@ -486,7 +486,7 @@ $(LIB_STATIC): $(OBJECTS) .PRECIOUS: %.d %.mo: %.po - @echo " [MSGFMT] $($@ %.so: %.o - @echo " [CC] $( /dev/null @@ -560,7 +560,7 @@ $(LIB_STATIC): $(OBJECTS) .PRECIOUS: %.d %.mo: %.po - @echo " [MSGFMT] $( $@ 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 && \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index f449a9500..a79edbd4d 100644 --- a/scripts/Makefile.in +++ b/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 $( $@ $(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] $( /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] $($@ %_install: %.rules - @echo " [INSTALL] $<" + $(SHOW) " [INSTALL] $<" $(Q) $(INSTALL_DATA) -D $< $(udevdir)/$(