src/Makefile: Don't unnecessarily set plugin specific CXXFLAGS.

Also, drop unneeded -lphread / -ldl from grpc's libraries.

diff --git a/src/Makefile.am b/src/Makefile.am
index 4dff62d..183567d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -434,10 +434,9 @@ 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_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_CFLAGS = $(AM_CFLAGS)

 grpc_la_CXXFLAGS = $(AM_CXXFLAGS) -std=c++11
 grpc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 grpc_la_CXXFLAGS = $(AM_CXXFLAGS) -std=c++11
 grpc_la_LDFLAGS = $(PLUGIN_LDFLAGS)

-grpc_la_LIBADD = -lgrpc++ -lgrpc -lgpr -lprotobuf -lpthread -ldl
+grpc_la_LIBADD = -lgrpc++ -lgrpc -lgpr -lprotobuf

 endif
 
 if BUILD_PLUGIN_HDDTEMP
 endif
 
 if BUILD_PLUGIN_HDDTEMP