Merge pull request #1738 from tokkee/sh/silent

src/Makefile: Support silent build rules for pod2man.

diff --combined src/Makefile.am
index 900a2eb,02960ac..6679296
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -17,10 -17,6 +17,10 @@@ endi
  AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
  AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
  
 +V_PROTOC = $(v_protoc_@AM_V@)
 +v_protoc_ = $(v_protoc_@AM_DEFAULT_V@)
 +v_protoc_0 = @echo "  PROTOC  " $@;
 +
  noinst_LTLIBRARIES =
  check_PROGRAMS =
  TESTS =
@@@ -108,24 -104,6 +108,24 @@@ pkglib_LTLIBRARIES 
  BUILT_SOURCES =
  CLEANFILES =
  
 +if HAVE_PROTOC3
 +if HAVE_GRPC_CPP
 +BUILT_SOURCES += collectd.grpc.pb.cc collectd.pb.cc types.pb.cc
 +CLEANFILES += collectd.grpc.pb.cc collectd.pb.cc types.pb.cc \
 +              collectd.grpc.pb.h collectd.pb.h types.pb.h
 +
 +collectd.grpc.pb.cc: $(top_srcdir)/proto/collectd.proto $(top_srcdir)/proto/types.proto
 +      $(V_PROTOC)@PROTOC@ -I$(top_srcdir)/proto \
 +              --grpc_out=$(builddir) --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN) $<
 +
 +collectd.pb.cc: $(top_srcdir)/proto/collectd.proto $(top_srcdir)/proto/types.proto
 +      $(V_PROTOC)@PROTOC@ -I$(top_srcdir)/proto --cpp_out=$(builddir) $<
 +
 +types.pb.cc: $(top_srcdir)/proto/types.proto
 +      $(V_PROTOC)@PROTOC@ -I$(top_srcdir)/proto --cpp_out=$(builddir) $<
 +endif
 +endif
 +
  if BUILD_PLUGIN_AGGREGATION
  pkglib_LTLIBRARIES += aggregation.la
  aggregation_la_SOURCES = aggregation.c \
@@@ -417,16 -395,6 +417,16 @@@ gmond_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(
  gmond_la_LIBADD = $(GANGLIA_LIBS)
  endif
  
 +if BUILD_PLUGIN_GRPC
 +pkglib_LTLIBRARIES += grpc.la
 +grpc_la_SOURCES = grpc.cc
 +nodist_grpc_la_SOURCES = collectd.grpc.pb.cc collectd.pb.cc types.pb.cc
 +grpc_la_CPPFLAGS = $(AM_CPPFLAGS) -std=c++11
 +grpc_la_CXXFLAGS = $(AM_CXXFLAGS) -std=c++11
 +grpc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +grpc_la_LIBADD = -lgrpc++ -lgrpc -lgpr -lprotobuf
 +endif
 +
  if BUILD_PLUGIN_HDDTEMP
  pkglib_LTLIBRARIES += hddtemp.la
  hddtemp_la_SOURCES = hddtemp.c
@@@ -1352,8 -1320,13 +1352,13 @@@ EXTRA_DIST =  collectd.conf.pod 
                types.db \
                types.db.pod
  
+ AM_V_POD2MAN_C = $(am__v_POD2MAN_C_@AM_V@)
+ am__v_POD2MAN_C_ = $(am__v_POD2MAN_C_@AM_DEFAULT_V@)
+ am__v_POD2MAN_C_0 = @echo "  POD2MAN " $@;
+ am__v_POD2MAN_C_1 =
+ 
  .pod.1:
-       pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
+       $(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
                >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
        @if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
        then \
@@@ -1361,7 -1334,7 +1366,7 @@@
        fi
  
  .pod.5:
-       pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \
+       $(AM_V_POD2MAN_C)pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \
                >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
        @if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
        then \
@@@ -1370,7 -1343,7 +1375,7 @@@
  
  AM_V_PROTOC_C = $(am__v_PROTOC_C_@AM_V@)
  am__v_PROTOC_C_ = $(am__v_PROTOC_C_@AM_DEFAULT_V@)
- am__v_PROTOC_C_0 = @echo "  PROTOC-C    " $@;
+ am__v_PROTOC_C_0 = @echo "  PROTOC-C" $@;
  am__v_PROTOC_C_1 =
  
  # Protocol buffer for the "pinba" plugin.