Merge branch 'master' into connectivity

[collectd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6a0f78e..f60efd3 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
@@ -768,6 +768,15 @@ chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 chrony_la_LIBADD = -lm
 endif
 
+if BUILD_PLUGIN_CONNECTIVITY
+pkglib_LTLIBRARIES += connectivity.la
+connectivity_la_SOURCES = src/connectivity.c
+connectivity_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
+connectivity_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
+connectivity_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
+connectivity_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) $(BUILD_WITH_LIBMNL_LIBS) libignorelist.la
+endif
+
 if BUILD_PLUGIN_CONNTRACK
 pkglib_LTLIBRARIES += conntrack.la
 conntrack_la_SOURCES = src/conntrack.c
@@ -1014,6 +1023,13 @@ gps_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBGPS_LDFLAGS)
 gps_la_LIBADD = -lpthread $(BUILD_WITH_LIBGPS_LIBS)
 endif
 
+if BUILD_PLUGIN_GPU_NVIDIA
+pkglib_LTLIBRARIES += gpu_nvidia.la
+gpu_nvidia_la_SOURCES = src/gpu_nvidia.c
+gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_GPU_CUDA_LDFLAGS)
+gpu_nvidia_la_LIBADD = $(BUILD_WITH_CUDA_LIBS)
+endif
+
 if BUILD_PLUGIN_GRPC
 pkglib_LTLIBRARIES += grpc.la
 grpc_la_SOURCES = src/grpc.cc