From: Gene Czarcinski <gene@czarc.net>
To: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] btrfs-progs pretty/quiet build
Date: Fri, 25 Jan 2013 07:57:31 -0500 [thread overview]
Message-ID: <5102813B.3090400@czarc.net> (raw)
In-Reply-To: <5101C4A4.30304@redhat.com>
On 01/24/2013 06:32 PM, Eric Sandeen wrote:
> A quieter build makes warnings more obvious.
>
> This could probably be improved, but just to see
> if people like this or if they hate it. :)
>
> make V=1 overrides it and gets you the full
> glory again.
>
> # make
> [CC] ctree.o
> [CC] disk-io.o
> [CC] radix-tree.o
> [CC] extent-tree.o
> ...
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
> Makefile | 92 +++++++++++++++++++++++++++++++++++++++++-----------------
> man/Makefile | 29 +++++++-----------
> 2 files changed, 76 insertions(+), 45 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 4894903..73657bf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -20,6 +20,21 @@ bindir = $(prefix)/bin
> LIBS=-luuid -lm
> RESTORE_LIBS=-lz
>
> +ifeq ("$(origin V)", "command line")
> + BUILD_VERBOSE = $(V)
> +endif
> +ifndef BUILD_VERBOSE
> + BUILD_VERBOSE = 0
> +endif
> +
> +ifeq ($(BUILD_VERBOSE),1)
> + Q =
> +else
> + Q = @
> +endif
> +
> +MAKEOPTS = --no-print-directory Q=$(Q)
> +
> progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
> btrfs btrfs-map-logical btrfs-image btrfs-zero-log btrfs-convert \
> btrfs-find-root btrfs-restore btrfstune
> @@ -28,90 +43,113 @@ progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
> ifdef C
> check = sparse $(CHECKFLAGS)
> else
> - check = ls
> + check = true
> endif
>
> .c.o:
> - $(check) $<
> - $(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<
> + $(Q)$(check) $<
> + @echo " [CC] $@"
> + $(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<
>
>
> all: version $(progs) manpages
>
> version:
> - bash version.sh
> + $(Q)bash version.sh
>
> btrfs: $(objects) btrfs.o help.o common.o $(cmds_objects)
> - $(CC) $(CFLAGS) -o btrfs btrfs.o help.o common.o $(cmds_objects) \
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs btrfs.o help.o common.o $(cmds_objects) \
> $(objects) $(LDFLAGS) $(LIBS) -lpthread
>
> calc-size: $(objects) calc-size.o
> - $(CC) $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)
>
> btrfs-find-root: $(objects) find-root.o
> - $(CC) $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
>
> btrfs-restore: $(objects) restore.o
> - $(CC) $(CFLAGS) -o btrfs-restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
>
> btrfsctl: $(objects) btrfsctl.o
> - $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
>
> btrfs-vol: $(objects) btrfs-vol.o
> - $(CC) $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS)
>
> btrfs-show: $(objects) btrfs-show.o
> - $(CC) $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS)
>
> btrfsck: $(objects) btrfsck.o
> - $(CC) $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS)
>
> mkfs.btrfs: $(objects) mkfs.o
> - $(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS)
>
> btrfs-debug-tree: $(objects) debug-tree.o
> - $(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS)
>
> btrfs-zero-log: $(objects) btrfs-zero-log.o
> - $(CC) $(CFLAGS) -o btrfs-zero-log $(objects) btrfs-zero-log.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-zero-log $(objects) btrfs-zero-log.o $(LDFLAGS) $(LIBS)
>
> btrfs-select-super: $(objects) btrfs-select-super.o
> - $(CC) $(CFLAGS) -o btrfs-select-super $(objects) btrfs-select-super.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-select-super $(objects) btrfs-select-super.o $(LDFLAGS) $(LIBS)
>
> btrfstune: $(objects) btrfstune.o
> - $(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS)
>
> btrfs-map-logical: $(objects) btrfs-map-logical.o
> - $(CC) $(CFLAGS) -o btrfs-map-logical $(objects) btrfs-map-logical.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-map-logical $(objects) btrfs-map-logical.o $(LDFLAGS) $(LIBS)
>
> btrfs-corrupt-block: $(objects) btrfs-corrupt-block.o
> - $(CC) $(CFLAGS) -o btrfs-corrupt-block $(objects) btrfs-corrupt-block.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-corrupt-block $(objects) btrfs-corrupt-block.o $(LDFLAGS) $(LIBS)
>
> btrfs-image: $(objects) btrfs-image.o
> - $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS)
>
> dir-test: $(objects) dir-test.o
> - $(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS)
>
> quick-test: $(objects) quick-test.o
> - $(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
>
> btrfs-convert: $(objects) convert.o
> - $(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS)
>
> ioctl-test: $(objects) ioctl-test.o
> - $(CC) $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS)
> + @echo " [LD] $@"
> + $(Q)$(CC) $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS)
>
> manpages:
> - cd man; $(MAKE)
> + @echo " [LD] $@"
> + $(Q)$(MAKE) $(MAKEOPTS) -C man
>
> install-man:
> cd man; $(MAKE) install
>
> clean :
> - rm -f $(progs) cscope.out *.o .*.d btrfs-convert btrfs-image btrfs-select-super \
> + @echo "Cleaning"
> + $(Q)rm -f $(progs) cscope.out *.o .*.d btrfs-convert btrfs-image btrfs-select-super \
> btrfs-zero-log btrfstune dir-test ioctl-test quick-test version.h
> - cd man; $(MAKE) clean
> + $(Q)$(MAKE) $(MAKEOPTS) -C man $@
>
> install: $(progs) install-man
> $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
> diff --git a/man/Makefile b/man/Makefile
> index 4a90b75..2c063bd 100644
> --- a/man/Makefile
> +++ b/man/Makefile
> @@ -6,31 +6,24 @@ bindir = $(prefix)/bin
> mandir = $(prefix)/man
> man8dir = $(mandir)/man8
>
> +# clear out all suffixes
> +.SUFFIXES:
> +# list only those we use
> +.SUFFIXES: .in .gz
> +
> MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \
> btrfs-show.8.gz btrfs.8.gz
> +INFILES = ${MANPAGES:.in=.gz}
>
> all: $(MANPAGES)
>
> -mkfs.btrfs.8.gz: mkfs.btrfs.8.in
> - $(GZIP) -n -c mkfs.btrfs.8.in > mkfs.btrfs.8.gz
> -
> -btrfs.8.gz: btrfs.8.in
> - $(GZIP) -n -c btrfs.8.in > btrfs.8.gz
> -
> -btrfsctl.8.gz: btrfsctl.8.in
> - $(GZIP) -n -c btrfsctl.8.in > btrfsctl.8.gz
> -
> -btrfsck.8.gz: btrfsck.8.in
> - $(GZIP) -n -c btrfsck.8.in > btrfsck.8.gz
> -
> -btrfs-image.8.gz: btrfs-image.8.in
> - $(GZIP) -n -c btrfs-image.8.in > btrfs-image.8.gz
> -
> -btrfs-show.8.gz: btrfs-show.8.in
> - $(GZIP) -n -c btrfs-show.8.in > btrfs-show.8.gz
> +.in.gz :
> + @echo " [MAN] $@"
> + $(Q)$(GZIP) -n -c $< > $@
>
> clean :
> - rm -f $(MANPAGES)
> + @echo "Cleaning manpages"
> + $(Q)rm -f $(MANPAGES)
>
> install: $(MANPAGES)
> $(INSTALL) -m755 -d $(DESTDIR)$(man8dir)
>
>
I like this. When I do a make the messages just fly by and it is not
possible to spot a warning.
Gene
prev parent reply other threads:[~2013-01-25 12:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 23:32 [PATCH] btrfs-progs pretty/quiet build Eric Sandeen
2013-01-25 12:57 ` Gene Czarcinski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5102813B.3090400@czarc.net \
--to=gene@czarc.net \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.