5 files changed, 32 insertions, 5 deletions
diff --git a/make/emd2exml.in b/make/emd2exml.in
index b677ef8ed4..5bfe89894e 100644
--- a/make/emd2exml.in
+++ b/make/emd2exml.in
@@ -5,7 +5,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/make/otp.mk.in b/make/otp.mk.in
index fca9cf3cff..91e2d8a95e 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -4,7 +4,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2012. All Rights Reserved.
+# Copyright Ericsson AB 1997-2013. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
diff --git a/make/otp_ded.mk.in b/make/otp_ded.mk.in
index e2232acbb1..0c9a8a087f 100644
--- a/make/otp_ded.mk.in
+++ b/make/otp_ded.mk.in
@@ -2,7 +2,7 @@
 # ----------------------------------------------------
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2009-2010. All Rights Reserved.
+# Copyright Ericsson AB 2009-2013. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index 65a2e62979..998e25a436 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2012. All Rights Reserved.
+# Copyright Ericsson AB 1997-2013. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
diff --git a/make/output.mk.in b/make/output.mk.in
index 2f1a1d3a79..938f878ebe 100644
--- a/make/output.mk.in
+++ b/make/output.mk.in
@@ -4,7 +4,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2012. All Rights Reserved.
+# Copyright Ericsson AB 1997-2013. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -22,19 +22,35 @@
 # Author: Anthony Ramine
 # ----------------------------------------------------
 
+# These variables are used to produce less output when running make with V=0 or
+# with the --enable-silent-rules flag.
+#
+# For each compiler kind of file generated by a command during the building of
+# Erlang/OTP, a variable named <command>_verbose should be defined and used as
+# a command prefix. The generic gen_verbose variable is offered for
+# miscellaneous operations like sed, cp or magical Perl incantations.
+#
+# A second variable V_<COMMAND> is also provided for major compilation tools
+# like CC, ERLC or JAVAC.
+
+# DEFAULT_VERBOSITY is set by the --enable-silent-rules configure flag.
 ifeq ($(V),)
 V = @DEFAULT_VERBOSITY@
 endif
 
+# v_p should be used with `test` to dynamically print things.
 ifeq ($(V),0)
 v_p = 0
 else
 v_p = 1
 endif
 
+# V_at is the @ prefix when silent rules are enabled.
 V_at_0 = @
 V_at = $(V_at_$(V))
 
+# V_colon makes the prefixed command into a no-op if silent rules are enabled,
+# useful to annihilate an `echo` command.
 V_colon_0 = @: ""
 V_colon = $(V_colon_$(V))
 
@@ -49,6 +65,10 @@ cc_verbose_0 = @echo " CC	"$@;
 cc_verbose = $(cc_verbose_$(V))
 V_CC = $(cc_verbose)$(CC)
 
+cpp_verbose_0 = @echo " CPP	"$@;
+cpp_verbose = $(cpp_verbose_$(V))
+
+# For the diameter compiler.
 dia_verbose_0 = @echo " DIA	"$@;
 dia_verbose = $(dia_verbose_$(V))
 
@@ -87,6 +107,11 @@ V_LEX = $(lex_verbose)$(LEX)
 m4_verbose_0 = @echo " M4	"$@;
 m4_verbose = $(m4_verbose_$(V))
 
+# V_MAKE isn't defined and shouldn't be to avoid breaking parallel building and
+# the following warning:
+#
+#     warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
+#
 make_verbose_0 = @echo " MAKE	"$@;
 make_verbose = $(make_verbose_$(V))
 
@@ -105,6 +130,8 @@ V_RC = $(rc_verbose)$(RC)
 snmp_verbose_0 = @echo " SNMP	"$@;
 snmp_verbose = $(snmp_verbose_$(V))
 
+# vsn_verbose should be used instead of gen_verbose when sed or another tool
+# is used to insert a version number into a file.
 vsn_verbose_0 = @echo " VSN	"$@;
 vsn_verbose = $(vsn_verbose_$(V))