X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=641e2fae53cead1c386f4cbf37671d57f29f0156;hb=cd3a393e43f2557bbe6aa3cdceb7ce2fafacceec;hp=66792961e021e9326744ab7178d0c605e8398ca5;hpb=9f19d00282cf8623e0233ef539649358a5b5803e;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index 66792961..641e2fae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,8 @@ endif AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' +LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_top_srcdir)/testwrapper.sh + V_PROTOC = $(v_protoc_@AM_V@) v_protoc_ = $(v_protoc_@AM_DEFAULT_V@) v_protoc_0 = @echo " PROTOC " $@; @@ -285,7 +287,8 @@ endif if BUILD_PLUGIN_CURL pkglib_LTLIBRARIES += curl.la -curl_la_SOURCES = curl.c +curl_la_SOURCES = curl.c \ + utils_curl_stats.c utils_curl_stats.h curl_la_LDFLAGS = $(PLUGIN_LDFLAGS) curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) @@ -293,7 +296,8 @@ endif if BUILD_PLUGIN_CURL_JSON pkglib_LTLIBRARIES += curl_json.la -curl_json_la_SOURCES = curl_json.c +curl_json_la_SOURCES = curl_json.c \ + utils_curl_stats.c utils_curl_stats.h curl_json_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) curl_json_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) @@ -302,7 +306,8 @@ endif if BUILD_PLUGIN_CURL_XML pkglib_LTLIBRARIES += curl_xml.la -curl_xml_la_SOURCES = curl_xml.c +curl_xml_la_SOURCES = curl_xml.c \ + utils_curl_stats.c utils_curl_stats.h curl_xml_la_LDFLAGS = $(PLUGIN_LDFLAGS) curl_xml_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) @@ -1350,7 +1355,8 @@ EXTRA_DIST = collectd.conf.pod \ collectd-unixsock.pod \ postgresql_default.conf \ types.db \ - types.db.pod + types.db.pod \ + valgrind.FreeBSD.suppress AM_V_POD2MAN_C = $(am__v_POD2MAN_C_@AM_V@) am__v_POD2MAN_C_ = $(am__v_POD2MAN_C_@AM_DEFAULT_V@)