Improve silent-rules support.

diff --git a/ChangeLog b/ChangeLog
index d01522e052437865775e1350092d7c39c6e80433..f195cc2b67623d36394b07c4a4362947b56874c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-23  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (AM_INIT_AUTOMAKE): Add 'silent-rules' option.
+
 2009-05-23  Bruno Haible  <bruno@clisp.org>
 
        * m4/init-package-version.m4: New file.

diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog
index 6d15dd03e0062d3ed2268d11502098c8971bb704..97bb570e92523c1ab14d49ec87d8572e8f59a60a 100644 (file)
--- a/autoconf-lib-link/ChangeLog
+++ b/autoconf-lib-link/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-23  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (AM_INIT_AUTOMAKE): Add 'silent-rules' option.
+
 2009-05-23  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Invoke gl_INIT_PACKAGE. Use the preferred form of

diff --git a/autoconf-lib-link/configure.ac b/autoconf-lib-link/configure.ac
index a4f531b9981aacce86682436a5823d431f531ab3..f8ee785c29edf2235c51daa24b00cfdb8e708fff 100644 (file)
--- a/autoconf-lib-link/configure.ac
+++ b/autoconf-lib-link/configure.ac
@@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([tests/rpath-1a])
 AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
 gl_INIT_PACKAGE([autoconf-lib-link], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules])
 
 dnl Checks for programs.
 AC_PROG_CC

diff --git a/configure.ac b/configure.ac
index f032c64c1a5450dde1b1a0c91a60ad247bd6ad4a..c872a522e594c229f980f6180fe9db4fc0c23bb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 . $srcdir/version.sh
 gl_INIT_PACKAGE([gettext], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules])
 
 dnl Override automake's tar command used for creating distributions.
 am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 1a3d4349bd6456286cbd8d539990e6f2733e8658..db5fb8bf2be7634aa551139c1019eacea23a5f8d 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-23  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (AM_INIT_AUTOMAKE): Add 'silent-rules' option.
+
 2009-05-23  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Invoke gl_INIT_PACKAGE. Use the preferred form of

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 1cced524185022d478fb967b0a1006acb3523db4..df3584bedf8b497b15b885b05aaf964c13397f5f 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([intl/dcigettext.c])
 AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
 gl_INIT_PACKAGE([gettext-runtime], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules])
 AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 826460715c934dbb0e6b29314ec12cd99b6b907a..0eabe4f0a9218492394eef09e3bf0ff7f6d223a1 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-06  Bruno Haible  <bruno@clisp.org>
+
+       Interoperate with automake-1.11 provided --enable-silent-rules option.
+       * Makefile.in (AM_V_at, AM_V_AR, AM_V_CC, AM_V_GEN, AM_V_YACC,
+       AM_V_lt): New variables.
+       (libintl.a, libintl.la, .c.o, .y.c, *.lo): Silence 'make' output if
+       silent rules requested.
+
 2009-04-26  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (VASNPRINTF): Update after the calling convention of

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 3ff8cd9d68548782472e1d10ecaf50b8726ddbc7..d0a1f80ac2a5111aaa3addc2e64095bc1976e2f3 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -77,6 +77,26 @@ WINDRES = @WINDRES@
 # Windows resource compiler (windres). Used via libtool.
 RC = @RC@
 
+# Support for silent-rules.
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_@INTL_DEFAULT_VERBOSITY@)
+am__v_at_0 = @
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_@INTL_DEFAULT_VERBOSITY@)
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_@INTL_DEFAULT_VERBOSITY@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_@INTL_DEFAULT_VERBOSITY@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_YACC = $(am__v_YACC_$(V))
+am__v_YACC_ = $(am__v_YACC_@INTL_DEFAULT_VERBOSITY@)
+am__v_YACC_0 = @echo "  YACC  " $@;
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_@INTL_DEFAULT_VERBOSITY@)
+am__v_lt_0 = --silent
+
 # -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
 # -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
@@ -191,12 +211,12 @@ all-no-yes: libgnuintl.$la
 all-no-no:
 
 libintl.a libgnuintl.a: $(OBJECTS)
-       rm -f $@
-       $(AR) cru $@ $(OBJECTS)
-       $(RANLIB) $@
+       $(AM_V_at)rm -f $@
+       $(AM_V_AR)$(AR) cru $@ $(OBJECTS)
+       $(AM_V_at)$(RANLIB) $@
 
 libintl.la libgnuintl.la: $(OBJECTS) $(OBJECTS_RES_@WOE32@)
-       $(LIBTOOL) --mode=link \
+       $(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \
          $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
          $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \
          $(OBJECTS_RES_@WOE32@) \
@@ -217,68 +237,68 @@ LTV_AGE=0
 .SUFFIXES: .c .y .o .lo .sin .sed
 
 .c.o:
-       $(COMPILE) $<
+       $(AM_V_CC)$(COMPILE) $<
 
 .y.c:
-       $(YACC) $(YFLAGS) --output $@ $<
-       rm -f $*.h
+       $(AM_V_YACC)$(YACC) $(YFLAGS) --output $@ $<
+       $(AM_V_at)rm -f $*.h
 
 bindtextdom.lo: $(srcdir)/bindtextdom.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
 dcgettext.lo: $(srcdir)/dcgettext.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
 dgettext.lo: $(srcdir)/dgettext.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dgettext.c
 gettext.lo: $(srcdir)/gettext.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/gettext.c
 finddomain.lo: $(srcdir)/finddomain.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/finddomain.c
 hash-string.lo: $(srcdir)/hash-string.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/hash-string.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/hash-string.c
 loadmsgcat.lo: $(srcdir)/loadmsgcat.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
 localealias.lo: $(srcdir)/localealias.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/localealias.c
 textdomain.lo: $(srcdir)/textdomain.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/textdomain.c
 l10nflist.lo: $(srcdir)/l10nflist.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
 explodename.lo: $(srcdir)/explodename.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/explodename.c
 dcigettext.lo: $(srcdir)/dcigettext.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
 dcngettext.lo: $(srcdir)/dcngettext.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
 dngettext.lo: $(srcdir)/dngettext.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dngettext.c
 ngettext.lo: $(srcdir)/ngettext.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/ngettext.c
 plural.lo: $(srcdir)/plural.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/plural.c
 plural-exp.lo: $(srcdir)/plural-exp.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
 localcharset.lo: $(srcdir)/localcharset.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/localcharset.c
 threadlib.lo: $(srcdir)/threadlib.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/threadlib.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/threadlib.c
 lock.lo: $(srcdir)/lock.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/lock.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/lock.c
 relocatable.lo: $(srcdir)/relocatable.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/relocatable.c
 langprefs.lo: $(srcdir)/langprefs.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/langprefs.c
 localename.lo: $(srcdir)/localename.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/localename.c
 log.lo: $(srcdir)/log.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/log.c
 printf.lo: $(srcdir)/printf.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/printf.c
 version.lo: $(srcdir)/version.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/version.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/version.c
 osdep.lo: $(srcdir)/osdep.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/osdep.c
 intl-compat.lo: $(srcdir)/intl-compat.c
-       $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
+       $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
 
 # This rule is executed only on Woe32 systems.
 # The following sed expressions come from the windres-options script. They are

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 490129797db45a06ba6598ac96180b6781187fff..c048def11b52e1c4b21f746deac2b7a4c07beb27 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-06  Bruno Haible  <bruno@clisp.org>
+
+       Interoperate with automake-1.11 provided --enable-silent-rules option.
+       * intl.m4 (AM_INTL_SUBDIR): Set INTL_DEFAULT_VERBOSITY.
+
 2009-05-21  Bruno Haible  <bruno@clisp.org>
 
        Avoid redefinition warnings for SIZE_MAX.

diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 1942207d978d2aa59e0f1bf8d8f0b6523f7fe60a..2b446d2cd4375cf3e09db2c034cda3dc6f6985ee 100644 (file)
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 12 (gettext-0.18)
+# intl.m4 serial 13 (gettext-0.18)
 dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -42,6 +42,14 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([gl_XSIZE])dnl
   AC_REQUIRE([gt_INTL_MACOSX])dnl
 
+  dnl Support for automake's --enable-silent-rules.
+  case "$enable_silent_rules" in
+    yes) INTL_DEFAULT_VERBOSITY=0;;
+    no)  INTL_DEFAULT_VERBOSITY=1;;
+    *)   INTL_DEFAULT_VERBOSITY=1;;
+  esac
+  AC_SUBST([INTL_DEFAULT_VERBOSITY])
+
   AC_CHECK_TYPE([ptrdiff_t], ,
     [AC_DEFINE([ptrdiff_t], [long],
        [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index bb6a78371e94d209e85564c13410a8856dabbafa..7d8216e423fd009d02a95c24aeb0d34ca6e99a47 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([src/msgfmt.c])
 AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
 gl_INIT_PACKAGE([gettext-tools], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules])
 AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 0e6a537061fe6ae664860b4e795eb90049da22a4..9c8abc87239698b2a65555cc69de3a4337f8ab89 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-23  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (AM_INIT_AUTOMAKE): Add 'silent-rules' option.
+
 2009-05-23  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Invoke gl_INIT_PACKAGE. Use the preferred form of

diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
index b8e0bc028a87e4dc3f0493e33e8b5e6667b374da..75cd086bb342b4e9d0086614a5a595e0785a443d 100644 (file)
--- a/gettext-tools/examples/configure.ac
+++ b/gettext-tools/examples/configure.ac
@@ -22,7 +22,7 @@ AC_CONFIG_SRCDIR([installpaths.in])
 AC_CONFIG_AUX_DIR([../../build-aux])
 . $srcdir/../../version.sh
 gl_INIT_PACKAGE([gettext-examples], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'