X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=eaff0dd1a216de3a3ad8c64204309a5cdf9633b9;hb=d93f3c0416de98817665c8998d17a6d853c19619;hp=c44955cc8f402399e6a38e75d8ffecf3ba0dd3e1;hpb=40e784205b367cc0d5fe2a3a1846e710c4558a17;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index c44955cc..eaff0dd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,7 +127,7 @@ bin_PROGRAMS = \
 endif # BUILD_WIN32
 
 
-EXTRA_LTLIBRARIES = \
+noinst_LTLIBRARIES = \
 	libavltree.la \
 	libcmds.la \
 	libcommon.la \
@@ -576,7 +576,7 @@ liboconfig_la_LDFLAGS = -avoid-version $(LEXLIB)
 
 if BUILD_WITH_LIBCURL
 if BUILD_WITH_LIBSSL
-if BUILD_WITH_LIBYAJL
+if BUILD_WITH_LIBYAJL2
 noinst_LTLIBRARIES += liboauth.la
 liboauth_la_SOURCES = \
 	src/utils_oauth.c \
@@ -599,11 +599,7 @@ test_utils_oauth_LDADD = \
 	liboauth.la \
 	libcommon.la \
 	libplugin_mock.la
-endif
-endif
-endif
 
-if BUILD_WITH_LIBCURL
 noinst_LTLIBRARIES += libgce.la
 libgce_la_SOURCES = \
 	src/utils_gce.c \
@@ -614,27 +610,29 @@ libgce_la_CPPFLAGS = \
 libgce_la_LIBADD = \
 	$(BUILD_WITH_LIBCURL_LIBS)
 endif
+endif
+endif
 
-if BUILD_WITH_LIBYAJL
-noinst_LTLIBRARIES += libformat_gcm.la
-libformat_gcm_la_SOURCES = \
-	src/utils_format_gcm.c \
-	src/utils_format_gcm.h
-libformat_gcm_la_CPPFLAGS = \
+if BUILD_WITH_LIBYAJL2
+noinst_LTLIBRARIES += libformat_stackdriver.la
+libformat_stackdriver_la_SOURCES = \
+	src/utils_format_stackdriver.c \
+	src/utils_format_stackdriver.h
+libformat_stackdriver_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(BUILD_WITH_LIBYAJL_CPPFLAGS)
-libformat_gcm_la_LIBADD = \
+libformat_stackdriver_la_LIBADD = \
 	libavltree.la \
 	$(BUILD_WITH_LIBSSL_LIBS) \
 	$(BUILD_WITH_LIBYAJL_LIBS)
 
-check_PROGRAMS += test_format_gcm
-TESTS += test_format_gcm
-test_format_gcm_SOURCES = \
-	src/utils_format_gcm_test.c \
+check_PROGRAMS += test_format_stackdriver
+TESTS += test_format_stackdriver
+test_format_stackdriver_SOURCES = \
+	src/utils_format_stackdriver_test.c \
 	src/testing.h
-test_format_gcm_LDADD = \
-	libformat_gcm.la \
+test_format_stackdriver_LDADD = \
+	libformat_stackdriver.la \
 	libplugin_mock.la \
 	-lm
 endif
@@ -1016,6 +1014,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
@@ -1581,7 +1586,7 @@ python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBPYTHON_LDFLAGS)
 endif
 
 if HAVE_LIBMNL
-EXTRA_LTLIBRARIES += libtaskstats.la
+noinst_LTLIBRARIES += libtaskstats.la
 libtaskstats_la_SOURCES = \
 	src/utils_taskstats.c \
 	src/utils_taskstats.h
@@ -1980,15 +1985,6 @@ write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 write_http_la_LIBADD = libformat_json.la $(BUILD_WITH_LIBCURL_LIBS)
 endif
 
-if BUILD_PLUGIN_WRITE_GCM
-pkglib_LTLIBRARIES += write_gcm.la
-write_gcm_la_SOURCES = src/write_gcm.c
-write_gcm_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-write_gcm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
-write_gcm_la_LIBADD = libformat_gcm.la libgce.la liboauth.la \
-                     $(BUILD_WITH_LIBCURL_LIBS)
-endif
-
 if BUILD_PLUGIN_WRITE_KAFKA
 pkglib_LTLIBRARIES += write_kafka.la
 write_kafka_la_SOURCES = src/write_kafka.c
@@ -2050,6 +2046,15 @@ write_sensu_la_SOURCES = src/write_sensu.c
 write_sensu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 endif
 
+if BUILD_PLUGIN_WRITE_STACKDRIVER
+pkglib_LTLIBRARIES += write_stackdriver.la
+write_stackdriver_la_SOURCES = src/write_stackdriver.c
+write_stackdriver_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+write_stackdriver_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
+write_stackdriver_la_LIBADD = libformat_stackdriver.la libgce.la liboauth.la \
+                     $(BUILD_WITH_LIBCURL_LIBS)
+endif
+
 if BUILD_PLUGIN_WRITE_TSDB
 pkglib_LTLIBRARIES += write_tsdb.la
 write_tsdb_la_SOURCES = src/write_tsdb.c