Make the build silent by default

Make it verbose when building the Debian packages.

configure.ac

@@ -11,6 +11,8 @@ DPKG_ARCHITECTURE
 
 AM_INIT_AUTOMAKE([1.8 gnu nostdinc])
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AM_GNU_GETTEXT_VERSION([0.16.1])
 AM_GNU_GETTEXT([external])
 

debian/changelog

@@ -6,6 +6,8 @@ dpkg (1.15.5) UNRELEASED; urgency=low
     - Remove install-info, now a wrapper that will disappear soonish.
     - Add programs used by dpkg itself: sh, rm, find, tar and dpkg-deb.
   * Check and warn on duplicate conffiles in dpkg-deb. Closes: #131633
+  * Make the upstream build system silent by default with automake 1.11 or
+    newer, and always verbose when building the Debian packages.
 
   [ Raphaël Hertzog ]
   * Add versioned dependency on base-files (>= 5.0.0) to dpkg-dev to ensure

debian/rules

@@ -48,6 +48,7 @@ build-tree/config.status: configure
 	install -d build-tree
 	cd build-tree && ../configure $(confflags) \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		--disable-silent-rules \
 		--prefix=/usr \
 		--mandir=\$${datadir}/man \
 		--infodir=\$${datadir}/info \

dpkg-split/Makefile.am

@@ -30,13 +30,13 @@ EXTRA_DIST = mksplit.pl
 CLEANFILES = $(pkglib_SCRIPTS)
 
 
-do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):"
+do_perl_subst = $(AM_V_GEN) sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):"
 
 
 %: %.pl Makefile
 	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
 	$(do_perl_subst) <$< >$@
-	chmod +x $@
+	$(AM_V_at) chmod +x $@
 
 
 install-data-local:

dselect/Makefile.am

@@ -52,7 +52,7 @@ CLEANFILES = curkeys.h
 
 curkeys.$(OBJEXT): curkeys.h
 curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
-	cursesfile=`echo '#include "dselect-curses.h"' | \
+	$(AM_V_GEN) cursesfile=`echo '#include "dselect-curses.h"' | \
 		$(CPP) -I$(top_builddir) -I $(srcdir) - | \
 		grep 'curses.h' | head -n 1 | \
 		sed -e 's/^[^"]*"//; s/".*$$//'`; \

man/Makefile.am

@@ -1,5 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
+PO4A_V = $(PO4A_V_$(V))
+PO4A_V_ = $(PO4A_V_$(AM_DEFAULT_VERBOSITY))
+PO4A_V_0 = @echo "  PO4A   $@";
+
+PO4A_RM_V = $(PO4A_RM_V_$(V))
+PO4A_RM_V_ = $(PO4A_RM_V_$(AM_DEFAULT_VERBOSITY))
+PO4A_RM_V_0 = @echo "  PO4ARM $@";
+
 all-local: all-local-@USE_NLS@
 
 all-local-no:
@@ -11,20 +19,20 @@ PO4A_CLEAN_OPTS = $(PO4A_COMMON_OPTS) --rm-backups --rm-translations
 
 # FIXME: Use a stamp file until po4a supports them internally.
 man.stamp:
-	cd $(srcdir) && \
+	$(PO4A_V) cd $(srcdir) && \
 	po4a $(PO4A_BUILD_OPTS) po/po4a.cfg
-	touch $@
+	$(AM_V_at) touch $@
 
 clean-local: clean-local-@USE_NLS@
 
 clean-local-no:
 clean-local-yes:
-	cd $(srcdir) && \
+	$(PO4A_RM_V) cd $(srcdir) && \
 	po4a $(PO4A_CLEAN_OPTS) po/po4a.cfg
-	rm -f man.stamp
+	$(AM_V_at) rm -f man.stamp
 
 update-po:
-	cd $(srcdir) && \
+	$(PO4A_V) cd $(srcdir) && \
 	po4a $(PO4A_BUILD_OPTS) --force po/po4a.cfg
 
 # Extract the list of languages from the po4a config file.

scripts/Makefile.am

@@ -130,7 +130,8 @@ nobase_dist_perllib_DATA = \
 	Dpkg/Version.pm \
 	Dpkg.pm
 
-do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" \
+do_perl_subst = $(AM_V_GEN) \
+		sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" \
 		    -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \
 		    -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \
 		    -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \
@@ -140,7 +141,7 @@ do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" \
 %: %.pl Makefile
 	@test -d `dirname $@` || $(mkdir_p) `dirname $@`
 	$(do_perl_subst) <$< >$@
-	chmod +x $@
+	$(AM_V_at) chmod +x $@
 
 install-data-local:
 	$(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives