From 23ab272555d384a6556e65e1ffc3d9e8e940ea7d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 26 Mar 2010 15:41:41 -0700 Subject: [PATCH] Add support for 'make -s' silent builds The cleanest way to do this is to set AM_LIBTOOLFLAGS = --silent. However, AM_LIBTOOLFLAGS is not honored by automake-1.9.6-2.1 which is what I have been using. To cleanly handle this I am updating to automake-1.11-3 which is why it looks like there is a lot of churn in the Makefiles. --- config/Rules.am | 4 +--- configure.ac | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/Rules.am b/config/Rules.am index 115fa348f4..bb188427ea 100644 --- a/config/Rules.am +++ b/config/Rules.am @@ -1,9 +1,7 @@ DEFAULT_INCLUDES = -include ${top_srcdir}/zfs_config.h -# FIXME: Add -Wshadow once everything is working +AM_LIBTOOLFLAGS = --silent AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror - -# Expected defines not covered by zfs_config.h or spl_config.h AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT AM_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 AM_CFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" diff --git a/configure.ac b/configure.ac index 1ef7003f97..0d30f5e70a 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ ZFS_AC_META AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_SYSTEM AM_MAINTAINER_MODE +AM_SILENT_RULES AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION]) AC_CONFIG_HEADERS([zfs_config.h], [ (mv zfs_config.h zfs_config.h.tmp &&