From 10b00c575c642e008c7b0c0440d7dc79d8954503 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 3 Jun 2012 18:40:48 +0200 Subject: [PATCH] configure: add silent-rules support to custom rules Signed-off-by: "Yann E. MORIN" --- frontends/qconf/Makefile.am | 6 +++++- libs/images/Makefile.am | 6 +++--- libs/parser/Makefile.am | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am index 7160b9e..adbcc1e 100644 --- a/frontends/qconf/Makefile.am +++ b/frontends/qconf/Makefile.am @@ -15,5 +15,9 @@ qconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la \ CLEANFILES = qconf.moc EXTRA_DIST = qconf.cc.patch +AM_V_MOC = $(AM_V_MOC_$(V)) +AM_V_MOC_ = $(AM_V_MOC_$(AM_DEFAULT_VERBOSITY)) +AM_V_MOC_0 = @echo " MOC " $@; + .h.moc: - $(MOC) -i $< -o $@ + $(AM_V_MOC)$(MOC) -i $< -o $@ diff --git a/libs/images/Makefile.am b/libs/images/Makefile.am index 13879c4..c29b1ab 100644 --- a/libs/images/Makefile.am +++ b/libs/images/Makefile.am @@ -6,8 +6,8 @@ BUILT_SOURCES = images.c images.h CLEANFILES = images.c images.h images.c: images.c_orig - $(SED) -r -e 's/^static //' $< >$@ + $(AM_V_GEN)$(SED) -r -e 's/^static //' $< >$@ images.h: images.c_orig - $(SED) -r -e '/^static (const char \*xpm_(.+)\[\]) = \{/!d; s//extern \1;/' \ - $< >$@ + $(AM_V_GEN)$(SED) -r -e '/^static (const char \*xpm_(.+)\[\]) = \{/!d; s//extern \1;/' \ + $< >$@ diff --git a/libs/parser/Makefile.am b/libs/parser/Makefile.am index bf00764..7bbc2e6 100644 --- a/libs/parser/Makefile.am +++ b/libs/parser/Makefile.am @@ -22,8 +22,12 @@ EXTRA_DIST = yconf.y.patch # Can't use libkconfig_parser_a_CPPFLAGS, as it breaks dependencies #yconf.o: CPPFLAGS+=$(intl_CPPFLAGS) +AM_V_GPERF = $(AM_V_GPERF_$(V)) +AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY)) +AM_V_GPERF_0 = @echo " GPERF " $@; + .gperf.c: - $(GPERF) -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $< + $(AM_V_GPERF)$(GPERF) -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $< # The following rule produces a warning: # libs/parser/Makefile.am:41: user target `.l.c' defined here... @@ -41,4 +45,4 @@ EXTRA_DIST = yconf.y.patch # also renamed, but automake does not now that, and make would fail # because it would think no file was generated. .l.c: - $(LEXCOMPILE) -o$@ $< + $(AM_V_LEX)$(LEXCOMPILE) -o$@ $< -- 2.39.5