Add support for configure --enable-verbose-makecmds

Some people don't want to see the concise "kernel-style" make output.
This configure option allows build engines that want to see the full
set of commands executed by the makefile to get what they want.  Most
people will find this more distracting than useful, unless they need
to debug the Makefiles.

(It is not necessary to rerun configure to enable this verbose make
output temprarily; if a developer wants to do a quick debug of a
directory's makefile, he or she can simply edit the definition of the
$(E) and $(Q) variables in the Makefile; instructions can be found in
the MCONFIG file which is included in at the beginning of every
Makefile.)

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/MCONFIG.in b/MCONFIG.in
index bc23338..6381eac 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -32,6 +32,17 @@ datadir = @datadir@
 
 @SET_MAKE@
 
+E = @E@
+Q = @Q@
+
+# Uncomment to pretty-print the makefile commands
+# E = @echo
+# Q = @
+#
+# Uncomment to show the full makefile commands
+# E = @\#
+# Q = 
+
 CC = @CC@
 BUILD_CC = @BUILD_CC@
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@

diff --git a/configure b/configure
index 01dd14f..9460d3b 100755 (executable)
--- a/configure
+++ b/configure
@@ -744,6 +744,8 @@ PROFILE_CMT
 BSDLIB_CMT
 ELF_CMT
 HTREE_CMT
+Q
+E
 MAINTAINER_CMT
 LINUX_INCLUDE
 EGREP
@@ -824,6 +826,7 @@ with_ccopts
 with_ldopts
 with_root_prefix
 enable_maintainer_mode
+enable_verbose_makecmds
 enable_compression
 enable_htree
 enable_elf_shlibs
@@ -1483,6 +1486,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode enable makefile rules useful for maintainers
+  --enable-verbose-makecmds  enable verbose make command output
   --enable-compression   enable EXPERIMENTAL compression support
   --enable-htree         enable EXPERIMENTAL htree directory support
   --enable-elf-shlibs    select ELF shared libraries
@@ -3937,6 +3941,31 @@ $as_echo "Disabling maintainer mode by default" >&6; }
 fi
 
 
+# Check whether --enable-verbose-makecmds was given.
+if test "${enable_verbose_makecmds+set}" = set; then
+  enableval=$enable_verbose_makecmds; if test "$enableval" = "no"
+then
+       { $as_echo "$as_me:$LINENO: result: Disabling verbose make commands" >&5
+$as_echo "Disabling verbose make commands" >&6; }
+       E=@echo
+       Q=@
+else
+       { $as_echo "$as_me:$LINENO: result: Enabling verbose make commands" >&5
+$as_echo "Enabling verbose make commands" >&6; }
+       E=@\\#
+       Q=
+fi
+
+else
+  { $as_echo "$as_me:$LINENO: result: Disabling verbose make commands" >&5
+$as_echo "Disabling verbose make commands" >&6; }
+E=@echo
+Q=@
+
+fi
+
+
+
 # Check whether --enable-compression was given.
 if test "${enable_compression+set}" = set; then
   enableval=$enable_compression; if test "$enableval" = "no"

diff --git a/configure.in b/configure.in
index 30cfc2b..0a1232c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -172,6 +172,28 @@ AC_MSG_RESULT([Disabling maintainer mode by default])
 )
 AC_SUBST(MAINTAINER_CMT)
 dnl
+dnl handle --enable-verbose-makecmds
+dnl
+AC_ARG_ENABLE([verbose-makecmds],
+[  --enable-verbose-makecmds  enable verbose make command output],
+if test "$enableval" = "no"
+then
+       AC_MSG_RESULT([Disabling verbose make commands])
+       E=@echo
+       Q=@
+else
+       AC_MSG_RESULT([Enabling verbose make commands])
+       E=@\\#
+       Q= 
+fi
+,
+AC_MSG_RESULT([Disabling verbose make commands])
+E=@echo
+Q=@
+)
+AC_SUBST(E)
+AC_SUBST(Q)
+dnl
 dnl handle --enable-compression
 dnl
 AC_ARG_ENABLE([compression],

diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 6ec2a00..d0a90f6 100644 (file)
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -30,34 +30,34 @@ DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \
        $(DEPLIBBLKID) $(DEPLIBUUID)
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
 
 all:: $(PROGS) $(MANPAGES)
 
 debugfs: $(DEBUG_OBJS) $(DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
 
 debug_cmds.c debug_cmds.h: debug_cmds.ct
-       @echo " MK_CMDS $@"
-       @$(MK_CMDS) $(srcdir)/debug_cmds.ct
+       $(E) "  MK_CMDS $@"
+       $(Q) $(MK_CMDS) $(srcdir)/debug_cmds.ct
 
 debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
 
 installdirs:
-       @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+       $(E) "  MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
                $(DESTDIR)$(man8dir)
 
 install: $(PROGS) $(MANPAGES) installdirs
-       @for i in $(PROGS); do \
+       $(Q) for i in $(PROGS); do \
                echo "  INSTALL $(root_sbindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
        done
-       @for i in $(MANPAGES); do \
+       $(Q) for i in $(MANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
                done; \
@@ -66,7 +66,7 @@ install: $(PROGS) $(MANPAGES) installdirs
        done
 
 install-strip: install
-       @for i in $(PROGS); do \
+       $(Q) for i in $(PROGS); do \
                echo "  STRIP $(root_sbindir)/$$i"; \
                $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
        done

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9c961f3..5ee7bba 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -19,26 +19,26 @@ HTML=texi2html
 all:: libext2fs.info libext2fs.dvi
 
 install-doc-libs: libext2fs.info libext2fs.dvi
-       @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
-       @echo " MKINSTALLDIRS $(infodir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
-       -@for i in libext2fs.info* ; do \
+       $(Q) $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
+       $(E) "  MKINSTALLDIRS $(infodir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+       -$(Q) for i in libext2fs.info* ; do \
                echo "  INSTALL_DATA $(infodir)/$$i" ; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
        done
-       @echo " GZIP $(infodir)/libext2fs.info*"
-       -@gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+       $(E) "  GZIP $(infodir)/libext2fs.info*"
+       -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
 
 uninstall-doc-libs:
        $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
 
 libext2fs.info: $(srcdir)/libext2fs.texinfo
-       @echo " MAKEINFO $@"
-       -@$(INFO) $(srcdir)/libext2fs.texinfo
+       $(E) "  MAKEINFO $@"
+       -$(Q) $(INFO) $(srcdir)/libext2fs.texinfo
 
 libext2fs.dvi: $(srcdir)/libext2fs.texinfo
-       @echo " TEXI2DVI $@"
-       -@$(DVI) $(srcdir)/libext2fs.texinfo
+       $(E) "  TEXI2DVI $@"
+       -$(Q) $(DVI) $(srcdir)/libext2fs.texinfo
 
 .PHONY: distclean
 distclean:: clean

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index c31f2d8..f150442 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -33,9 +33,9 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) \
 COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) -c $(ALL_CFLAGS) $< -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 #
 # Flags for using Checker
@@ -110,48 +110,48 @@ all:: profiled $(PROGS) e2fsck $(MANPAGES) $(FMANPAGES)
 @PROFILE_CMT@all:: e2fsck.profiled
 
 prof_err.c prof_err.h: prof_err.et
-       @echo " COMPILE_ET prof_err.et"
-       @$(COMPILE_ET) $(srcdir)/prof_err.et
+       $(E) "  COMPILE_ET prof_err.et"
+       $(Q) $(COMPILE_ET) $(srcdir)/prof_err.et
 
 e2fsck: $(OBJS)  $(DEPLIBS)
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) 
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) 
 
 e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
-       @echo " LD $@"
-       @$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) 
+       $(E) "  LD $@"
+       $(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) 
 
 e2fsck.profiled: $(PROFILED_OBJS)  $(PROFILED_DEPLIBS)
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
                $(PROFILED_LIBS) 
 
 gen_crc32table: $(srcdir)/gen_crc32table.c
-       @echo " CC $@"
-       @$(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \
+       $(E) "  CC $@"
+       $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \
                $(srcdir)/gen_crc32table.c
 
 crc32table.h: gen_crc32table
-       @echo " GEN32TABLE $@"
-       @./gen_crc32table > crc32table.h
+       $(E) "  GEN32TABLE $@"
+       $(Q) ./gen_crc32table > crc32table.h
 
 tst_problem: $(srcdir)/problem.c $(srcdir)/problem.h $(LIBEXT2FS) \
        $(DEPLIBCOM_ERR)
-       @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \
+       $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \
                $(srcdir)/problem.c -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR)
 
 tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
+       $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
                -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR)
 
 tst_refcount: ea_refcount.c $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
                $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS) 
 
 tst_region: region.c $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_region $(srcdir)/region.c \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_region $(srcdir)/region.c \
                $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
 
 check:: tst_refcount tst_region tst_crc32 tst_problem
@@ -161,87 +161,87 @@ check:: tst_refcount tst_region tst_crc32 tst_problem
        LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_problem
 
 extend: extend.o
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
 
 flushb: flushb.o
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
 
 iscan: iscan.o util.o ehandler.o $(DEPLIBS)
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
 
 test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \
                prof_err.o profile.h $(DEPSTATIC_LIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
                profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \
                $(ALL_CFLAGS)
 
 profiled:
-@PROFILE_CMT@  @echo " MKDIR $@"
-@PROFILE_CMT@  @mkdir profiled
+@PROFILE_CMT@  $(E) "  MKDIR $@"
+@PROFILE_CMT@  $(Q) mkdir profiled
 
 e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
 
 e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.conf.5.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
 
 installdirs:
-       @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+       $(E) "  MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
                $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
 
 install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
-       @for i in $(PROGS); do \
+       $(Q) for i in $(PROGS); do \
                echo "  INSTALL $(root_sbindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
        done
-       @echo " LINK $(root_sbindir)/fsck.ext2"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+       $(E) "  LINK $(root_sbindir)/fsck.ext2"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
                        $(DESTDIR)$(root_sbindir)/fsck.ext2
-       @echo " LINK $(root_sbindir)/fsck.ext3"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+       $(E) "  LINK $(root_sbindir)/fsck.ext3"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
                        $(DESTDIR)$(root_sbindir)/fsck.ext3
-       @echo " LINK $(root_sbindir)/fsck.ext4"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+       $(E) "  LINK $(root_sbindir)/fsck.ext4"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
                        $(DESTDIR)$(root_sbindir)/fsck.ext4
-       @echo " LINK $(root_sbindir)/fsck.ext4dev"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+       $(E) "  LINK $(root_sbindir)/fsck.ext4dev"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
                        $(DESTDIR)$(root_sbindir)/fsck.ext4dev
-       @for i in $(MANPAGES); do \
+       $(Q) for i in $(MANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
                done; \
                echo "  INSTALL_DATA $(man8dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
        done
-       @for i in $(FMANPAGES); do \
+       $(Q) for i in $(FMANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
                done; \
                echo "  INSTALL_DATA $(man5dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
        done
-       @echo " LINK $(man8dir)/fsck.ext2.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+       $(E) "  LINK $(man8dir)/fsck.ext2.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
                $(DESTDIR)$(man8dir)/fsck.ext2.8
-       @echo " LINK $(man8dir)/fsck.ext3.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+       $(E) "  LINK $(man8dir)/fsck.ext3.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
                $(DESTDIR)$(man8dir)/fsck.ext3.8
-       @echo " LINK $(man8dir)/fsck.ext4.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+       $(E) "  LINK $(man8dir)/fsck.ext4.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
                $(DESTDIR)$(man8dir)/fsck.ext4.8
-       @echo " LINK $(man8dir)/fsck.ext4.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+       $(E) "  LINK $(man8dir)/fsck.ext4.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
                $(DESTDIR)$(man8dir)/fsck.ext4dev.8
 
 install-strip: install
-       @for i in $(PROGS); do \
+       $(Q) for i in $(PROGS); do \
                echo "  STRIP $(root_sbindir)/$$i"; \
                $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
        done

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 40a56a5..36592c1 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -146,11 +146,11 @@ all-no-yes: libgnuintl.$la
 all-no-no:
 
 libintl.a libgnuintl.a: $(OBJECTS)
-       @rm -f $@
-       @echo " AR $@"
-       @$(AR) cru $@ $(OBJECTS)
-       @echo " RANLIB $@"
-       @$(RANLIB) $@
+       $(Q) rm -f $@
+       $(E) "  AR $@"
+       $(Q) $(AR) cru $@ $(OBJECTS)
+       $(E) "  RANLIB $@"
+       $(Q) $(RANLIB) $@
 
 libintl.la libgnuintl.la: $(OBJECTS)
        $(LIBTOOL) --mode=link \
@@ -173,8 +173,8 @@ LTV_AGE=4
 .SUFFIXES: .c .y .o .lo .sin .sed
 
 .c.o:
-       @echo " CC $<"
-       @$(COMPILE) $<
+       $(E) "  CC $<"
+       $(Q) $(COMPILE) $<
 
 .y.c:
        $(YACC) $(YFLAGS) --output $@ $<
@@ -228,32 +228,32 @@ intl-compat.lo: $(srcdir)/intl-compat.c
        $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
 
 ref-add.sed: $(srcdir)/ref-add.sin
-       @echo " SED ref-add.sed"
-       @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
-       @mv t-ref-add.sed ref-add.sed
+       $(E) "  SED ref-add.sed"
+       $(Q) sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
+       $(Q) mv t-ref-add.sed ref-add.sed
 ref-del.sed: $(srcdir)/ref-del.sin
-       @echo " SED ref-del.sed"
-       @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
-       @mv t-ref-del.sed ref-del.sed
+       $(E) "  SED ref-del.sed"
+       $(Q) sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
+       $(Q) mv t-ref-del.sed ref-del.sed
 
 INCLUDES = -I. -I$(srcdir) -I..
 
 libgnuintl.h: $(srcdir)/libgnuintl.h.in
-       @echo " SED libgnuintl.h "
-       @sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+       $(E) "  SED libgnuintl.h "
+       $(Q) sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
            -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
            -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
            -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
          < $(srcdir)/libgnuintl.h.in > libgnuintl.h 
 
 libintl.h: libgnuintl.h
-       @echo " CP libintl.h"
-       @cp libgnuintl.h libintl.h
+       $(E) "  CP libintl.h"
+       $(Q) cp libgnuintl.h libintl.h
 
 charset.alias: $(srcdir)/config.charset
-       @echo " CONFIG.CHARSET $@"
-       @$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-       @mv t-$@ $@
+       $(E) "  CONFIG.CHARSET $@"
+       $(Q) $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+       $(Q) mv t-$@ $@
 
 check: all
 
@@ -264,7 +264,7 @@ check: all
 # package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
-       @if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+       $(Q) if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
           && test '@USE_INCLUDED_LIBINTL@' = yes; then \
          $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
          $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
@@ -279,7 +279,7 @@ install-exec: all
        else \
          : ; \
        fi
-       @if test "$(PACKAGE)" = "gettext-tools" \
+       $(Q) if test "$(PACKAGE)" = "gettext-tools" \
           && test '@USE_INCLUDED_LIBINTL@' = no; then \
          $(mkinstalldirs) $(DESTDIR)$(libdir); \
          $(LIBTOOL) --mode=install \
@@ -321,7 +321,7 @@ install-exec: all
          : ; \
        fi
 install-data: all
-       @if test "$(PACKAGE)" = "gettext-tools"; then \
+       $(Q) if test "$(PACKAGE)" = "gettext-tools"; then \
          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
          $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
          $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
@@ -474,8 +474,8 @@ distclean: clean
        fi
 
 maintainer-clean: distclean
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
+       $(E) "This command is intended for maintainers to use;"
+       $(E) "it deletes files that may require special tools to rebuild."
 
 
 # GNU gettext needs not contain the file `VERSION' but contains some

diff --git a/lib/Makefile.checker b/lib/Makefile.checker
index 8382a51..cdc1d7b 100644 (file)
--- a/lib/Makefile.checker
+++ b/lib/Makefile.checker
@@ -1,16 +1,16 @@
 all:: $(LIBRARY)_chk.a
 
 real-subdirs:: Makefile
-       @echo " MKDIR checker"
-       @mkdir -p checker
+       $(E) "  MKDIR checker"
+       $(Q) mkdir -p checker
 
 clean::
        $(RM) -rf checker
 
 $(LIBRARY)_chk.a: $(OBJS)
-       @echo " GEN_CHECKER_LIB $@"
-       @(test -r $@ && $(RM) -f $@.bak && $(MV) $@ $@.bak)
-       (cd checker; $(ARGEN) $@ $(OBJS))
-       -@$(RANLIB) $@
-       @$(RM) -f ../$@
-       @$(LN) $@ ../$@
+       $(E) "  GEN_CHECKER_LIB $@"
+       $(Q) (test -r $@ && $(RM) -f $@.bak && $(MV) $@ $@.bak)
+       $(Q) (cd checker; $(ARGEN) $@ $(OBJS))
+       -$(Q) $(RANLIB) $@
+       $(Q) $(RM) -f ../$@
+       $(Q) $(LN) $@ ../$@

diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib
index 3052b2e..a26200b 100644 (file)
--- a/lib/Makefile.darwin-lib
+++ b/lib/Makefile.darwin-lib
@@ -13,8 +13,8 @@
 all:: image
 
 real-subdirs:: Makefile
-       @echo " MKDIR pic"
-       @mkdir -p pic
+       $(E) "  MKDIR pic"
+       $(Q) mkdir -p pic
 
 BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
 BSDLIB_PIC_FLAG = -fPIC
@@ -22,19 +22,19 @@ BSDLIB_PIC_FLAG = -fPIC
 image:         $(BSD_LIB)
 
 $(BSD_LIB): $(OBJS)
-       @echo " GEN_BSD_SOLIB $(BSD_LIB)"
-       @(cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
+       $(E) "  GEN_BSD_SOLIB $(BSD_LIB)"
+       $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
                -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS))
-       @$(MV) pic/$(BSD_LIB) .
-       @$(RM) -f ../$(BSD_LIB)
-       @$(LN) $(BSD_LIB) ../$(BSD_LIB)
-       @$(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib
+       $(Q) $(MV) pic/$(BSD_LIB) .
+       $(Q) $(RM) -f ../$(BSD_LIB)
+       $(Q) $(LN) $(BSD_LIB) ../$(BSD_LIB)
+       $(Q) $(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib
 
 install-shlibs install:: $(BSD_LIB)
-       @echo " INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
-       @$(INSTALL_PROGRAM) $(BSD_LIB) \
+       $(E) "  INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
+       $(Q) $(INSTALL_PROGRAM) $(BSD_LIB) \
                $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
-       @-$(LDCONFIG)
+       -$(Q) $(LDCONFIG)
 
 install-strip: install
 

diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 4c778b9..c0202f4 100644 (file)
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -14,8 +14,8 @@
 all:: image
 
 real-subdirs:: Makefile
-       @echo " MKDIR elfshared"
-       @mkdir -p elfshared
+       $(E) "  MKDIR elfshared"
+       $(Q) mkdir -p elfshared
 
 ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
 ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -23,45 +23,45 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
 image:         $(ELF_LIB)
 
 $(ELF_LIB): $(OBJS)
-       @echo " GEN_ELF_SOLIB $(ELF_LIB)"
-       @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+       $(E) "  GEN_ELF_SOLIB $(ELF_LIB)"
+       $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
                -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
-       @$(MV) elfshared/$(ELF_LIB) .
-       @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
-       @$(LN) $(ELF_LIB) ../$(ELF_LIB)
-       @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
-       @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+       $(Q) $(MV) elfshared/$(ELF_LIB) .
+       $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+       $(Q) $(LN) $(ELF_LIB) ../$(ELF_LIB)
+       $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
+       $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
 
 installdirs-elf-lib::
-       @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+       $(E) "  MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
                $(DESTDIR)$(libdir)
 
 installdirs:: installdirs-elf-lib
 
 install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
-       @echo " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-       @$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
-       @echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
-       @$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
-       @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
-       @if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
+       $(E) "  INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+       $(Q) $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+       $(E) "  SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
+       $(Q) $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
+       $(E) "  SYMLINK $(libdir)/$(ELF_IMAGE).so"
+       $(Q) if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
                $(LN_S) -f $(ELF_SONAME) $(DESTDIR)$(libdir)/$(ELF_IMAGE).so ; \
        else \
                $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
                        $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
        fi                      
-       @echo " LDCONFIG"
-       @-$(LDCONFIG)
+       $(E) "  LDCONFIG"
+       $(Q) -$(LDCONFIG)
 
 install-strip: install
-       @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-       @$(STRIP) --strip-unneeded --remove-section=.comment \
+       $(E) "  STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+       $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
                --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
 
 install-shlibs-strip: install-shlibs
-       @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-       @$(STRIP) --strip-unneeded --remove-section=.comment \
+       $(E) "  STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+       $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
                --remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
 
 uninstall-shlibs uninstall::

diff --git a/lib/Makefile.library b/lib/Makefile.library
index 7d9e99f..f3b12f7 100644 (file)
--- a/lib/Makefile.library
+++ b/lib/Makefile.library
@@ -7,18 +7,18 @@ uninstall-shlibs::
 real-subdirs::
 
 subdirs:: Makefile
-       @$(MAKE) -s real-subdirs
-       @touch subdirs
+       $(Q) $(MAKE) -s real-subdirs
+       $(Q) touch subdirs
 
 clean::
-       @$(RM) -f subdirs
+       $(Q) $(RM) -f subdirs
 
 $(LIBRARY).a: $(OBJS)
-       @echo " GEN_LIB $@"
-       @(if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
-       @$(ARGEN) $@ $(OBJS)
+       $(E) "  GEN_LIB $@"
+       $(Q) (if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
+       $(Q) $(ARGEN) $@ $(OBJS)
        -@$(RANLIB) $@
-       @$(RM) -f ../$@
-       @$(LN) $@ ../$@
+       $(Q) $(RM) -f ../$@
+       $(Q) $(LN) $@ ../$@
 
 $(LIB)/$(LIBRARY).a: $(LIBRARY).a

diff --git a/lib/Makefile.profile b/lib/Makefile.profile
index a2e77c6..1e07b35 100644 (file)
--- a/lib/Makefile.profile
+++ b/lib/Makefile.profile
@@ -1,26 +1,26 @@
 all:: $(LIBRARY)_p.a
 
 real-subdirs:: Makefile
-       @echo " MKDIR profiled"
-       @mkdir -p profiled
+       $(E) "  MKDIR profiled"
+       $(Q) mkdir -p profiled
 
 clean::
        $(RM) -rf profiled
        $(RM) -f $(LIBRARY)_p.a ../$(LIBRARY)_p.a
 
 $(LIBRARY)_p.a: $(OBJS)
-       @echo " GEN_PROFILED_LIB $(ELF_LIB)"
-       @(if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
-       @(cd profiled; $(ARUPD) ../$@ $(OBJS))
-       -@$(RANLIB) $@
-       @$(RM) -f ../$@
-       @$(LN) $@ ../$@
+       $(E) "  GEN_PROFILED_LIB $(ELF_LIB)"
+       $(Q) (if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
+       $(Q) (cd profiled; $(ARUPD) ../$@ $(OBJS))
+       -$(Q) $(RANLIB) $@
+       $(Q) $(RM) -f ../$@
+       $(Q) $(LN) $@ ../$@
 
 install:: $(LIBRARY)_p.a installdirs
-       @echo " INSTALL_DATA $(libdir)/$(LIBRARY)_p.a"
-       @$(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
-       @-$(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
-       @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+       $(E) "  INSTALL_DATA $(libdir)/$(LIBRARY)_p.a"
+       $(Q) $(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+       -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+       $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/$(LIBRARY)_p.a

diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
index fcadfa3..f90d714 100644 (file)
--- a/lib/Makefile.solaris-lib
+++ b/lib/Makefile.solaris-lib
@@ -14,8 +14,8 @@
 all:: image
 
 real-subdirs:: Makefile
-       @echo " MKDIR elfshared"
-       @mkdir -p elfshared
+       $(E) "  MKDIR elfshared"
+       $(Q) mkdir -p elfshared
 
 ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
 ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -23,14 +23,14 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
 image:         $(ELF_LIB)
 
 $(ELF_LIB): $(OBJS)
-       @echo " GEN_ELF_SOLIB $(ELF_LIB)"
-       @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+       $(E) "  GEN_ELF_SOLIB $(ELF_LIB)"
+       $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
                -Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
-       @$(MV) elfshared/$(ELF_LIB) .
-       @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
-       @$(LN) $(ELF_LIB) ../$(ELF_LIB)
-       @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
-       @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+       $(Q) $(MV) elfshared/$(ELF_LIB) .
+       $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+       $(Q) $(LN) $(ELF_LIB) ../$(ELF_LIB)
+       $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
+       $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
 
 installdirs-elf-lib::
        $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \

diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 51d0c2a..9169226 100644 (file)
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -54,83 +54,83 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID)
 DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@      @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 all:: $(SMANPAGES) blkid.pc
 
 $(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); \
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); \
                CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status
 
 libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
 
 tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID)
-       @echo " LD $@"
-       @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
 
 tst_types: tst_types.o blkid_types.h 
-       @echo " LD $@"
-       @$(CC) -o tst_types tst_types.o 
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_types tst_types.o 
 
 ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h
-       @echo " CC $@"
-       @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
+       $(E) "  CC $@"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
                -o ../../misc/blkid.o
 
 blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
 
 test_probe: test_probe.in Makefile
-       @echo "Creating test_probe..."
-       @echo "#!/bin/sh" > test_probe
-       @echo "SRCDIR=@srcdir@" >> test_probe
-       @cat $(srcdir)/test_probe.in >> test_probe
-       @chmod +x test_probe
+       $(E) "Creating test_probe..."
+       $(E) "#!/bin/sh" > test_probe
+       $(E) "SRCDIR=@srcdir@" >> test_probe
+       $(Q) cat $(srcdir)/test_probe.in >> test_probe
+       $(Q) chmod +x test_probe
 
 check:: all tst_cache tst_dev tst_devname tst_devno tst_getsize tst_probe \
  tst_read tst_resolve tst_save tst_tag test_probe tst_types
@@ -138,33 +138,33 @@ check:: all tst_cache tst_dev tst_devname tst_devno tst_getsize tst_probe \
        ./tst_types
 
 blkid.pc: $(srcdir)/blkid.pc.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
 
 installdirs::
-       @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+       $(E) "  MKINSTALLDIRS $(libdir) $(includedir)/blkid"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
                $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
 
 install:: all installdirs 
-       @echo " INSTALL_DATA $(libdir)/libblkid.a"
-       @$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
-       @-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
-       @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
-       @set -e; for i in $(HFILES); do \
+       $(E) "  INSTALL_DATA $(libdir)/libblkid.a"
+       $(Q) $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
+       -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
+       $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
+       $(Q) set -e; for i in $(HFILES); do \
          echo "        INSTALL_DATA $(includedir)/blkid/$$i"; \
          $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \
        done
-       @set -e; for i in $(HFILES_IN); do \
+       $(Q) set -e; for i in $(HFILES_IN); do \
                echo "  INSTALL_DATA $(includedir)/blkid/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \
        done
-       @for i in $(SMANPAGES); do \
+       $(Q) for i in $(SMANPAGES); do \
                echo "  INSTALL_DATA $(man3dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
        done
-       @echo " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
-       @$(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
+       $(E) "  INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
+       $(Q) $(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libblkid.a \

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index c1a45f5..9775a98 100644 (file)
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -53,25 +53,25 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_CHECKER@
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@      @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 e2p.pc: $(srcdir)/e2p.pc.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
 
 tst_ostype: $(srcdir)/ostype.c
-       @echo " LD $@"
-       @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
+       $(E) "  LD $@"
+       $(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
                $(srcdir)/ostype.c $(ALL_CFLAGS)
 
 tst_feature: $(srcdir)/feature.c
-       @echo " LD $@"
-       @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
+       $(E) "  LD $@"
+       $(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
                $(srcdir)/feature.c $(ALL_CFLAGS)
 
 check::        tst_ostype tst_feature
@@ -79,21 +79,21 @@ check::     tst_ostype tst_feature
        ./tst_feature
 
 installdirs::
-       @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+       $(E) "  MKINSTALLDIRS $(libdir) $(includedir)/e2p"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
                $(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
 
 install:: all installdirs 
-       @echo " INSTALL_DATA $(libdir)/libe2p.a"
-       @$(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
-       @-$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
-       @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
-       @set -e; for i in $(HFILES); do \
+       $(E) "  INSTALL_DATA $(libdir)/libe2p.a"
+       $(Q) $(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
+       -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
+       $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
+       $(Q) set -e; for i in $(HFILES); do \
          echo "        INSTALL_DATA $(includedir)/e2p/$$i"; \
          $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \
        done
-       @echo " INSTALL_DATA $(libdir)/pkgconfig/e2p.pc"
-       @$(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
+       $(E) "  INSTALL_DATA $(libdir)/pkgconfig/e2p.pc"
+       $(Q) $(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libe2p.a \

diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 2a5f780..5cf374b 100644 (file)
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -41,12 +41,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 # what to build...
 #
 .c.o:
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@      @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 @MAKEFILE_LIBRARY@
 @MAKEFILE_ELF@
@@ -55,16 +55,16 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_CHECKER@
 
 compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
-       @$(CHMOD) +x compile_et
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
+       $(Q) $(CHMOD) +x compile_et
 
 com_err.ps : com_err.dvi
 com_err.dvi: com_err.texinfo
 
 com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
 
 #libcom_err.o: $(LIBOBJS)
 #      $(LD) -r -s -o libcom_err.o $(LIBOBJS)
@@ -74,34 +74,34 @@ TAGS:       $(SRCS)
        $(TAGS) $(SRCS)
 
 installdirs::
-       @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+       $(E) "  MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
                $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
                $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
                $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
 
 install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc
-       @echo " INSTALL_DATA $(libdir)/libcom_err.a"
-       @$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
-       @-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
-       @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
-       @for i in $(HFILES); do \
+       $(E) "  INSTALL_DATA $(libdir)/libcom_err.a"
+       $(Q) $(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
+       -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
+       $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
+       $(Q) for i in $(HFILES); do \
                echo "  INSTALL_DATA $(includedir)/et/$$i"; \
                $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \
        done
-       @for i in $(SHARE_FILES); do \
+       $(Q) for i in $(SHARE_FILES); do \
                echo "  INSTALL_DATA $(datadir)/et/$$i"; \
                $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \
        done
-       @echo " INSTALL_SCRIPT $(bindir)/compile_et"
-       @$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
-       @echo " INSTALL_DATA $(man3dir)/com_err.3"
-       @$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
-       @echo " INSTALL_DATA $(man1dir)/compile_et.1"
-       @$(INSTALL_DATA) $(srcdir)/compile_et.1 \
+       $(E) "  INSTALL_SCRIPT $(bindir)/compile_et"
+       $(Q) $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
+       $(E) "  INSTALL_DATA $(man3dir)/com_err.3"
+       $(Q) $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
+       $(E) "  INSTALL_DATA $(man1dir)/compile_et.1"
+       $(Q) $(INSTALL_DATA) $(srcdir)/compile_et.1 \
                        $(DESTDIR)$(man1dir)/compile_et.1
-       @echo " INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
-       @$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
+       $(E) "  INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
+       $(Q) $(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 4f465cc..67ff634 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -176,151 +176,151 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 all:: ext2fs.pc
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@      @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 COMPILE_ET=../et/compile_et --build-tree
 
 DISTFILES= Makefile *.c *.h image
 
 ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
 
 ext2_err.c ext2_err.h: ext2_err.et
-       @echo " COMPILE_ET ext2_err.et"
-       @$(COMPILE_ET) ext2_err.et
+       $(E) "  COMPILE_ET ext2_err.et"
+       $(Q) $(COMPILE_ET) ext2_err.et
 
 ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
 
 tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
                $(LIBCOM_ERR)
 
 tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
                $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
 
 tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
 
 tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
                $(LIBCOM_ERR)
 
 tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \
                $(LIBCOM_ERR) 
 
 tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
                $(LIBCOM_ERR)
 
 tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
                $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
 
 tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_sectgetsize tst_getsectsize.o \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_sectgetsize tst_getsectsize.o \
                $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
 
 tst_types: tst_types.o ext2_types.h 
-       @echo " LD $@"
-       @$(CC) -o tst_types tst_types.o 
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_types tst_types.o 
 
 tst_super_size: tst_super_size.o ext2_fs.h
-       @echo " LD $@"
-       @$(CC) -o tst_super_size tst_super_size.o 
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_super_size tst_super_size.o 
 
 ext2_tdbtool: tdbtool.o
-       @echo " LD $@"
-       @$(CC) -o ext2_tdbtool tdbtool.o tdb.o
+       $(E) "  LD $@"
+       $(Q) $(CC) -o ext2_tdbtool tdbtool.o tdb.o
 
 extent_dbg.c: $(srcdir)/extent_dbg.ct
-       @echo " MK_CMDS $<"
-       @$(MK_CMDS) $(srcdir)/extent_dbg.ct
+       $(E) "  MK_CMDS $<"
+       $(Q) $(MK_CMDS) $(srcdir)/extent_dbg.ct
 
 debug_cmds.c debug_cmds.h: $(top_srcdir)/debugfs/debug_cmds.ct
-       @echo " MK_CMDS $<@"
-       @$(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
+       $(E) "  MK_CMDS $<@"
+       $(Q) $(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
 
 DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
        lsdel.o dump.o set_fields.o logdump.o htree.o unused.o
 
 debugfs.o: $(top_srcdir)/debugfs/debugfs.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 util.o: $(top_srcdir)/debugfs/util.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 ncheck.o: $(top_srcdir)/debugfs/ncheck.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 icheck.o: $(top_srcdir)/debugfs/icheck.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 ls.o: $(top_srcdir)/debugfs/ls.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 lsdel.o: $(top_srcdir)/debugfs/lsdel.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 dump.o: $(top_srcdir)/debugfs/dump.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 set_fields.o: $(top_srcdir)/debugfs/set_fields.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 logdump.o: $(top_srcdir)/debugfs/logdump.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 htree.o: $(top_srcdir)/debugfs/htree.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 unused.o: $(top_srcdir)/debugfs/unused.c
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
 
 tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) \
        $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
                $(ALL_CFLAGS) -DDEBUG $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) \
                $(STATIC_LIBEXT2FS) $(LIBBLKID) $(LIBUUID) $(LIBCOM_ERR) \
                -I $(top_srcdir)/debugfs
 
 tst_csum: csum.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o tst_csum $(srcdir)/csum.c -DDEBUG \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o tst_csum $(srcdir)/csum.c -DDEBUG \
                $(ALL_CFLAGS) $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
 
 mkjournal: mkjournal.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
+       $(E) "  LD $@"
+       $(Q) $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
 
 check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size tst_types tst_csum
        LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops
@@ -332,25 +332,25 @@ check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size t
        LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
 
 installdirs::
-       @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+       $(E) "  MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
                $(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
 
 install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
-       @echo " INSTALL_DATA $(libdir)/libext2fs.a"
-       @$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
-       @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
-       @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
-       @for i in $(HFILES); do \
+       $(E) "  INSTALL_DATA $(libdir)/libext2fs.a"
+       $(Q) $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
+       -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
+       $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
+       $(Q) for i in $(HFILES); do \
                echo "  INSTALL_DATA $(includedir)/ext2fs/$$i"; \
                $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
        done
-       @for i in $(HFILES_IN); do \
+       $(Q) for i in $(HFILES_IN); do \
                echo "  INSTALL_DATA $(includedir)/ext2fs/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
        done
-       @echo " INSTALL_DATA $(libdir)/pkgconfig/ext2fs.pc"
-       @$(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
+       $(E) "  INSTALL_DATA $(libdir)/pkgconfig/ext2fs.pc"
+       $(Q) $(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libext2fs.a \

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index b058de5..4a2bdb1 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -37,12 +37,12 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
 XTRA_CFLAGS= -I$(srcdir)/../et
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $<
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@      @$(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $<
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 # for the library
 
@@ -96,18 +96,18 @@ FILES=      $(SRCS) $(MKCMDSFILES) $(HFILES) \
 all::  libss.a ss.pc # libss_p.a lint
 
 std_rqs.c: std_rqs.ct mk_cmds
-       @echo " MK_CMDS $@"
-       @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
+       $(E) "  MK_CMDS $@"
+       $(Q) DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
 
 std_rqs.o: ss_err.h
 
 test_cmd.c: test_cmd.ct mk_cmds
-       @echo " MK_CMDS $@"
-       @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
+       $(E) "  MK_CMDS $@"
+       $(Q) DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
 
 ss_err.c ss_err.h: ss_err.et
-       @echo " COMPILE_ET ss_err.et"
-       @$(COMPILE_ET) $(srcdir)/ss_err.et
+       $(E) "  COMPILE_ET ss_err.et"
+       $(Q) $(COMPILE_ET) $(srcdir)/ss_err.et
 
 ct.tab.c ct.tab.h: ct.y
        $(RM) -f ct.tab.* y.*
@@ -120,42 +120,42 @@ ct.tab.c ct.tab.h: ct.y
 #      $(CHMOD) -x $@
 
 mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
-       @$(CHMOD) +x mk_cmds
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
+       $(Q) $(CHMOD) +x mk_cmds
 
 ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
 
 installdirs::
-       @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+       $(E) "  MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
                $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
                $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
 
 install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds ss.pc
-       @echo " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a"
-       @$(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
-       @-$(RANLIB) $(DESTDIR)$(libdir)/libss.a
-       @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
-       @$(RM) -f $(DESTDIR)$(includedir)/ss/*
-       @for i in $(INSTALL_HFILES); do \
+       $(E) "  INSTALL_DATA $(DESTDIR)$(libdir)/libss.a"
+       $(Q) $(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
+       -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libss.a
+       $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
+       $(Q) $(RM) -f $(DESTDIR)$(includedir)/ss/*
+       $(Q) for i in $(INSTALL_HFILES); do \
                echo "  INSTALL_DATA $(DESTDIR)$(includedir)/ss/$$i"; \
                $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
        done
-       @echo " INSTALL_DATA $(includedir)/ss/ss_err.h"
-       @$(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
-       @for i in $(SHARE_FILES); do \
+       $(E) "  INSTALL_DATA $(includedir)/ss/ss_err.h"
+       $(Q) $(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
+       $(Q) for i in $(SHARE_FILES); do \
                echo "  INSTALL_DATA $(DESTDIR)$(datadir)/ss/$$i"; \
                $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \
        done
-       @echo " INSTALL $(bindir)/mk_cmds"
-       @$(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
-       @echo " INSTALL_DATA $(man1dir)/mk_cmds.1"
-       @$(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
-       @echo " INSTALL_DATA $(libdir)/pkgconfig/ss.pc"
-       @$(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
+       $(E) "  INSTALL $(bindir)/mk_cmds"
+       $(Q) $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
+       $(E) "  INSTALL_DATA $(man1dir)/mk_cmds.1"
+       $(Q) $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
+       $(E) "  INSTALL_DATA $(libdir)/pkgconfig/ss.pc"
+       $(Q) $(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds \
@@ -164,14 +164,14 @@ uninstall::
        $(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
 
 test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
-       @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
                $(LIBSS) $(LIBCOM_ERR)
 
 check:: all test_ss
-       @echo " RUN TEST test_ss"
+       $(E) "  RUN TEST test_ss"
        -@(LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0)
-       @if diff test_out $(srcdir)/test_script_expected > test.diff; then \
+       $(Q) if diff test_out $(srcdir)/test_script_expected > test.diff; then \
                true ; else echo "Regression test for ss library failed!"; exit 1 ; fi
 
 clean::

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 35fc2e9..e8c5a21 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -60,12 +60,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_CHECKER@
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) $(ALL_CFLAGS) -c $< -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
-@ELF_CMT@      @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
-@BSDLIB_CMT@   @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+@ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+@BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
 all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc
 
@@ -73,84 +73,84 @@ $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)
        cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
 
 tst_uuid.o: $(srcdir)/tst_uuid.c
-       @echo " CC $@"
-       @$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
+       $(E) "  CC $@"
+       $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
 
 tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
 
 uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
                $(LIBUUID)
 
 uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
 
 uuid_clear.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_clear.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
 
 uuid_compare.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_compare.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
 
 uuid_copy.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_copy.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
 
 uuid_generate.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_generate.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
 
 uuid_is_null.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_is_null.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
 
 uuid_parse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_parse.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
 
 uuid_time.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_time.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
 
 uuid_unparse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_unparse.3.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
 
 uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
 
 installdirs::
-       @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
+       $(E) "  MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
                $(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
                $(DESTDIR)$(libdir)/pkgconfig
 
 install:: all installdirs 
-       @echo " INSTALL_DATA $(libdir)/libuuid.a"
-       @$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
-       @-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
-       @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
-       @echo " INSTALL_DATA $(includedir)/uuid/uuid.h"
-       @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
-       @for i in $(SMANPAGES); do \
+       $(E) "  INSTALL_DATA $(libdir)/libuuid.a"
+       $(Q) $(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
+       -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
+       $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
+       $(E) "  INSTALL_DATA $(includedir)/uuid/uuid.h"
+       $(Q) $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
+       $(Q) for i in $(SMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
                echo "  INSTALL_DATA $(man3dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
        done
-       @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+       $(Q) $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
                $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
-       @echo " LINK $(man3dir)/uuid_generate_random.3"
-       @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
-       @echo " LINK $(man3dir)/uuid_generate_time.3"
-       @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
-       @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
-       @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+       $(E) "  LINK $(man3dir)/uuid_generate_random.3"
+       $(Q) $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+       $(E) "  LINK $(man3dir)/uuid_generate_time.3"
+       $(Q) $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+       $(E) "  INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
+       $(Q) $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libuuid.a \

diff --git a/misc/Makefile.in b/misc/Makefile.in
index d3dd2d0..d5a59ac 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -93,9 +93,9 @@ DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR)
 COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) -c $(ALL_CFLAGS) $< -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+       $(E) "  CC $<"
+       $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
        $(FMANPAGES) $(LPROGS)
@@ -106,93 +106,93 @@ all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
        e2image.profiled
 
 profiled:
-@PROFILE_CMT@  @echo " MKDIR $@"
-@PROFILE_CMT@  @mkdir profiled
+@PROFILE_CMT@  $(E) "  MKDIR $@"
+@PROFILE_CMT@  $(Q) mkdir profiled
 
 prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et
-       @echo " COMPILE_ET prof_err.et"
-       @$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
+       $(E) "  COMPILE_ET prof_err.et"
+       $(Q) $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
 
 default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk
-       @echo " PROFILE_TO_C mke2fs.conf"
-       @$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
+       $(E) "  PROFILE_TO_C mke2fs.conf"
+       $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
                >  default_profile.c
 profile.o:
-       @echo " CC $<"
-       @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
-@PROFILE_CMT@  @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \
+       $(E) "  CC $<"
+       $(Q) $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
+@PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \
 @PROFILE_CMT@  $(srcdir)/../e2fsck/profile.c
 
 findsuper: findsuper.o
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
 
 partinfo: partinfo.o
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
 
 e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
                $(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
 
 tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
                $(DEPLIBUUID) $(LIBEXT2FS) 
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
                $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBS_E2P) $(LIBINTL)
 
 tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
-       @echo " LD $@"
-       @$(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
                $(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
                $(STATIC_LIBE2P) $(LIBINTL)
 
 tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
                $(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
                $(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBBLKID) \
                $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
                $(PROFILED_LIBS) 
 
 blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
                $(LIBEXT2FS)
 
 blkid.static: $(BLKID_OBJS) $(STATIC_DEPLIBS) $(DEPSTATIC_LIBBLKID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \
                $(STATIC_LIBBLKID) $(LIBINTL)
 
 blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \
                $(PROFILED_LIBEXT2FS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
                $(PROFILED_LIBBLKID) $(LIBINTL) $(PROFILED_LIBEXT2FS)
 
 e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
 
 e2image.profiled: $(PROFILED_E2IMAGE_OBJS) $(PROFILED_DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
                $(PROFILED_E2IMAGE_OBJS) $(PROFILED_LIBS) $(LIBINTL)
 
 e2undo: $(E2UNDO_OBJS) $(DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
 
 e2undo.profiled: $(PROFILED_E2UNDO_OBJS) $(PROFILED_DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
                $(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL)
 
 base_device: base_device.c
-       @echo " LD $@"
-       @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
                -DDEBUG -o base_device
 
 check:: base_device
@@ -200,264 +200,264 @@ check:: base_device
        cmp $(srcdir)/base_device.tst base_device.out
 
 mklost+found: $(MKLPF_OBJS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
 
 mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \
                $(LIBEXT2FS) 
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
                $(LIBUUID) $(LIBEXT2FS) $(LIBE2P) $(LIBINTL)
 
 mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
                $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \
                $(STATIC_LIBUUID) $(LIBINTL)
 
 mke2fs.profiled: $(PROFILED_MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
        $(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID) 
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
                $(PROFILED_MKE2FS_OBJS) $(PROFILED_LIBBLKID) \
                $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
                $(PROFILED_LIBS)
 
 chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
 
 lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
 
 uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
 
 uuidgen.profiled: $(PROFILED_UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
                $(PROFILED_UUIDGEN_OBJS) $(PROFILED_LIBUUID) $(LIBINTL)
 
 uuidd: $(UUIDD_OBJS) $(DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
 
 uuidd.profiled: $(PROFILED_UUIDD_OBJS) $(PROFILED_DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
                $(PROFILED_LIBUUID) $(LIBINTL)
 
 dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
                $(LIBS_E2P) $(LIBUUID) $(LIBINTL)
 
 dumpe2fs.profiled: $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \
                $(PROFILED_LIBE2P) $(PROFILED_DEPLIBUUID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
                $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
                $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
 
 fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
 
 fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
                $(PROFILED_LIBBLKID) $(LIBINTL)
 
 badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
 
 badblocks.profiled: $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
                $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_LIBS) $(LIBINTL)
 
 logsave: logsave.o
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
 
 logsave.profiled: profiled/logsave.o
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
 
 filefrag: $(FILEFRAG_OBJS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) 
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) 
 
 filefrag.profiled: $(PROFILED_FILEFRAG_OBJS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
                $(PROFILED_FILEFRAG_OBJS) 
 
 tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
-       @echo " LD $@"
+       $(E) "  LD $@"
        $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \
                $(LIBCOM_ERR)
 
 tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
 
 mklost+found.8: $(DEP_SUBSTITUTE) $(srcdir)/mklost+found.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
 
 mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
 
 mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
 
 e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
 
 e2undo.8: $(DEP_SUBSTITUTE) $(srcdir)/e2undo.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
 
 findfs.8: $(DEP_SUBSTITUTE) $(srcdir)/findfs.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
 
 e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
 
 dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in 
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
 
 badblocks.8: $(DEP_SUBSTITUTE) $(srcdir)/badblocks.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8      
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8  
 
 fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 
 
 blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
 
 logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
 
 uuidd.8: $(DEP_SUBSTITUTE) $(srcdir)/uuidd.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
 
 chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 
 
 lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in 
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 
 
 uuidgen.1: $(DEP_SUBSTITUTE) $(srcdir)/uuidgen.1.in 
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 
 
 blkid.1: $(DEP_SUBSTITUTE) $(srcdir)/blkid.1.in 
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 
 
 filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
 
 installdirs:
-       @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
+       $(E) "  MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
                $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
                $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
                $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
                $(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
 
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
-       @for i in $(SPROGS); do \
+       $(Q) for i in $(SPROGS); do \
                echo "  INSTALL $(root_sbindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
        done
-       @for i in $(USPROGS); do \
+       $(Q) for i in $(USPROGS); do \
                echo "  INSTALL $(sbindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
        done
-       @echo " LINK $(root_sbindir)/mkfs.ext2"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+       $(E) "  LINK $(root_sbindir)/mkfs.ext2"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
                $(DESTDIR)$(root_sbindir)/mkfs.ext2
-       @echo " LINK $(root_sbindir)/mkfs.ext3"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+       $(E) "  LINK $(root_sbindir)/mkfs.ext3"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
                $(DESTDIR)$(root_sbindir)/mkfs.ext3
-       @echo " LINK $(root_sbindir)/mkfs.ext4"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+       $(E) "  LINK $(root_sbindir)/mkfs.ext4"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
                $(DESTDIR)$(root_sbindir)/mkfs.ext4
-       @echo " LINK $(root_sbindir)/mkfs.ext4dev"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+       $(E) "  LINK $(root_sbindir)/mkfs.ext4dev"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
                $(DESTDIR)$(root_sbindir)/mkfs.ext4dev
-       @echo " LINK $(root_sbindir)/e2label"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+       $(E) "  LINK $(root_sbindir)/e2label"
+       $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
                $(DESTDIR)$(root_sbindir)/e2label
-       @if test -n "$(FINDFS_LINK)"; then \
+       $(Q) if test -n "$(FINDFS_LINK)"; then \
                echo "  LINK $(root_sbindir)/findfs"; \
                $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
                        $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
        fi
-       @for i in $(UPROGS); do \
+       $(Q) for i in $(UPROGS); do \
                echo "  INSTALL $(bindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
        done
-       @for i in $(LPROGS); do \
+       $(Q) for i in $(LPROGS); do \
                echo "  INSTALL $(libdir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(libdir)/$$i; \
        done
-       @for i in $(SMANPAGES); do \
+       $(Q) for i in $(SMANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
                done; \
                echo "  INSTALL_DATA $(man8dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
        done
-       @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+       $(Q) $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
                $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
-       @echo " LINK mkfs.ext2.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+       $(E) "  LINK mkfs.ext2.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
                $(DESTDIR)$(man8dir)/mkfs.ext2.8
-       @echo " LINK mkfs.ext3.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+       $(E) "  LINK mkfs.ext3.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
                $(DESTDIR)$(man8dir)/mkfs.ext3.8
-       @echo " LINK mkfs.ext4.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+       $(E) "  LINK mkfs.ext4.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
                $(DESTDIR)$(man8dir)/mkfs.ext4.8
-       @echo " LINK mkfs.ext4dev.8"
-       @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+       $(E) "  LINK mkfs.ext4dev.8"
+       $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
                $(DESTDIR)$(man8dir)/mkfs.ext4dev.8
-       @for i in $(UMANPAGES); do \
+       $(Q) for i in $(UMANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
                done; \
                echo "  INSTALL_DATA $(man1dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
        done
-       @for i in $(FMANPAGES); do \
+       $(Q) for i in $(FMANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
                done; \
                echo "  INSTALL_DATA $(man5dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
        done
-       @if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+       $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
                if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
                        $(srcdir)/mke2fs.conf; then \
                        true; \
@@ -487,11 +487,11 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
        fi
 
 install-strip: install
-       @for i in $(SPROGS); do \
+       $(Q) for i in $(SPROGS); do \
                echo "  STRIP $(root_sbindir)/$$i"; \
                $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
        done
-       @for i in $(USPROGS); do \
+       $(Q) for i in $(USPROGS); do \
                echo "  STRIP $(sbindir)/$$i"; \
                $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
        done

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 25032ac..843b021 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -61,8 +61,8 @@ CATALOGS = @CATALOGS@
 .SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
 
 .po.mo:
-       @echo "$(MSGFMT) -c -o $@ $<"; \
-       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+       $(E) "$(MSGFMT) -c -o $@ $<"
+       $(Q) $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \

diff --git a/resize/Makefile.in b/resize/Makefile.in
index b947d6c..f58f3b0 100644 (file)
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -34,39 +34,39 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \
 DEPSTATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) 
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
 
 all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) 
 
 resize2fs: $(RESIZE_OBJS) $(DEPLIBS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) 
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) 
 
 resize2fs.static: $(RESIZE_OBJS) $(DEPSTATIC_LIBS)
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
                $(RESIZE_OBJS) $(STATIC_LIBS) 
 
 resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in
-       @echo " SUBST $@"
-       @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
+       $(E) "  SUBST $@"
+       $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
 
 test_extent: $(TEST_EXTENT_OBJS)
-       @echo " LD $@"
-       @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) 
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) 
 
 installdirs:
-       @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
-       @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+       $(E) "  MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+       $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
                $(DESTDIR)$(man8dir)
 
 install: $(PROGS) $(MANPAGES) installdirs
-       @for i in $(PROGS); do \
+       $(Q) for i in $(PROGS); do \
                echo "  INSTALL $(root_sbindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
        done
-       @for i in $(MANPAGES); do \
+       $(Q) for i in $(MANPAGES); do \
                for j in $(COMPRESS_EXT); do \
                        $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
                done; \
@@ -75,7 +75,7 @@ install: $(PROGS) $(MANPAGES) installdirs
        done
 
 install-strip: install
-       @for i in $(PROGS); do \
+       $(Q) for i in $(PROGS); do \
                echo "  STRIP $(root_sbindir)/$$i"; \
                $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
        done
@@ -93,7 +93,7 @@ test_extent.out: test_extent $(srcdir)/test_extent.in
                > test_extent.out
 
 check:: test_extent.out
-       @if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \
+       $(Q) if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \
                echo "Test succeeded." ; \
        else \
                echo "Test failed!" ; \

diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 495c728..0e28192 100644 (file)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -25,26 +25,26 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
 DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR)
 
 .c.o:
-       @echo " CC $<"
-       @$(CC) -c $(ALL_CFLAGS) $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
 
 all:: $(PROGS)
 
 test_rel: $(TEST_REL_OBJS) $(DEPLIBS)
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
 
 test_rel_cmds.c: test_rel_cmds.ct
-       @echo " MK_CMDS $@"
-       @$(MK_CMDS) $(srcdir)/test_rel_cmds.ct
+       $(E) "  MK_CMDS $@"
+       $(Q) $(MK_CMDS) $(srcdir)/test_rel_cmds.ct
 
 test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS)
-       @echo " LD $@"
-       @$(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
+       $(E) "  LD $@"
+       $(Q) $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
 
 test_icount_cmds.c: test_icount_cmds.ct
-       @echo " MK_CMDS $@"
-       @$(MK_CMDS) $(srcdir)/test_icount_cmds.ct
+       $(E) "  MK_CMDS $@"
+       $(Q) $(MK_CMDS) $(srcdir)/test_icount_cmds.ct
 
 clean:
        $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \

diff --git a/util/Makefile.in b/util/Makefile.in
index 4c3d07c..4ad769f 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -14,25 +14,25 @@ SRCS = $(srcdir)/subst.c
 @MCONFIG@
 
 .c.o:
-       @echo " CC $<"
-       @$(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
 
 PROGS=         subst
 
 all:: $(PROGS) gen-tarball
 
 subst: subst.o
-       @echo " LD $@"
-       @$(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o
+       $(E) "  LD $@"
+       $(Q) $(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o
 
 copy_sparse: copy_sparse.o
-       @echo " LD $@"
-       @$(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o
+       $(E) "  LD $@"
+       $(Q) $(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o
 
 gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
-       @chmod +x gen-tarball
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
+       $(Q) chmod +x gen-tarball
 
 tarballs: gen-tarball
        sh gen-tarball debian