Merge branch 'master' into procevent

[collectd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6a0f78e..82cafa8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -577,7 +577,7 @@ liboconfig_la_LDFLAGS = -avoid-version $(LEXLIB)
 if BUILD_WITH_LIBCURL
 if BUILD_WITH_LIBSSL
 if BUILD_WITH_LIBYAJL2
-EXTRA_LTLIBRARIES += liboauth.la
+noinst_LTLIBRARIES += liboauth.la
 liboauth_la_SOURCES = \
        src/utils_oauth.c \
        src/utils_oauth.h
@@ -600,7 +600,7 @@ test_utils_oauth_LDADD = \
        libcommon.la \
        libplugin_mock.la
 
-EXTRA_LTLIBRARIES += libgce.la
+noinst_LTLIBRARIES += libgce.la
 libgce_la_SOURCES = \
        src/utils_gce.c \
        src/utils_gce.h
@@ -614,7 +614,7 @@ endif
 endif
 
 if BUILD_WITH_LIBYAJL2
-EXTRA_LTLIBRARIES += libformat_stackdriver.la
+noinst_LTLIBRARIES += libformat_stackdriver.la
 libformat_stackdriver_la_SOURCES = \
        src/utils_format_stackdriver.c \
        src/utils_format_stackdriver.h
@@ -1602,6 +1602,14 @@ processes_la_LIBADD += libtaskstats.la
 endif
 endif
 
+if BUILD_PLUGIN_PROCEVENT
+pkglib_LTLIBRARIES += procevent.la
+procevent_la_SOURCES = src/procevent.c
+procevent_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
+procevent_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
+procevent_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) libignorelist.la
+endif
+
 if BUILD_PLUGIN_PROTOCOLS
 pkglib_LTLIBRARIES += protocols.la
 protocols_la_SOURCES = src/protocols.c