So far, setting silent mode was done in configure.ac, and was on by
default for "release" builds and off for "devel" builds.
However, in "release" builds, running "make V=1" would not display the
commands used to generate tsome files (like the ones generated via moc
or sed), because the MAKEFLAGS would always contain -s and it was not
possible to disable this behaviour unless by calling configure again.
Handle the SILENT_MAKEFLAGS like AM_V_GEN et al. are managed, by
diverting it to the correct value without the need to re-run configure.
At the same time, also provide the verbose versions of AM_V_MOC and
AM_V_GPERF (even if that is technically not needed, it's good for
homogeneity with the rest of the automake-generated code).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4
ACLOCAL_AMFLAGS = -I scripts/.autostuff/m4
-MAKEFLAGS = $(SILENT_MAKEFLAGS)
+MAKEFLAGS = $(SILENT_MAKEFLAGS_$(V))
+SILENT_MAKEFLAGS_ = $(SILENT_MAKEFLAGS_$(AM_DEFAULT_VERBOSITY))
+SILENT_MAKEFLAGS_0 = --no-print-directory -s
+SILENT_MAKEFLAGS_1 =
AM_V_GPERF = $(AM_V_GPERF_$(V))
AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
AM_V_GPERF_0 = @echo " GPERF " $@;
AM_V_GPERF = $(AM_V_GPERF_$(V))
AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
AM_V_GPERF_0 = @echo " GPERF " $@;
.gperf.c:
$(AM_V_GPERF)$(GPERF) -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $<
.gperf.c:
$(AM_V_GPERF)$(GPERF) -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $<
AM_V_MOC = $(AM_V_MOC_$(V))
AM_V_MOC_ = $(AM_V_MOC_$(AM_DEFAULT_VERBOSITY))
AM_V_MOC_0 = @echo " MOC " $@;
AM_V_MOC = $(AM_V_MOC_$(V))
AM_V_MOC_ = $(AM_V_MOC_$(AM_DEFAULT_VERBOSITY))
AM_V_MOC_0 = @echo " MOC " $@;
.h.moc:
$(AM_V_MOC)$(MOC) -i $< -o $@
.h.moc:
$(AM_V_MOC)$(MOC) -i $< -o $@
[AM_SILENT_RULES],
[AM_SILENT_RULES([yes])])
[AM_SILENT_RULES],
[AM_SILENT_RULES([yes])])
-AS_IF(
- [test $AM_DEFAULT_VERBOSITY -eq 0],
- [SILENT_MAKEFLAGS="--no-print-directory -s"],
- [SILENT_MAKEFLAGS=""])
-AC_SUBST([SILENT_MAKEFLAGS])
-
#----------------------------------------
# Prepare libtool
m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl Automake, we have a problem...
#----------------------------------------
# Prepare libtool
m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl Automake, we have a problem...