projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.9' into collectd-5.10
[collectd.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
e46d8dc
..
9e6c8fa
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-768,6
+768,12
@@
chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS)
chrony_la_LIBADD = -lm
endif
chrony_la_LIBADD = -lm
endif
+if BUILD_PLUGIN_CHECK_UPTIME
+pkglib_LTLIBRARIES += check_uptime.la
+check_uptime_la_SOURCES = src/check_uptime.c
+check_uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+endif
+
if BUILD_PLUGIN_CONNECTIVITY
pkglib_LTLIBRARIES += connectivity.la
connectivity_la_SOURCES = src/connectivity.c
if BUILD_PLUGIN_CONNECTIVITY
pkglib_LTLIBRARIES += connectivity.la
connectivity_la_SOURCES = src/connectivity.c
@@
-1026,8
+1032,8
@@
endif
if BUILD_PLUGIN_GPU_NVIDIA
pkglib_LTLIBRARIES += gpu_nvidia.la
gpu_nvidia_la_SOURCES = src/gpu_nvidia.c
if BUILD_PLUGIN_GPU_NVIDIA
pkglib_LTLIBRARIES += gpu_nvidia.la
gpu_nvidia_la_SOURCES = src/gpu_nvidia.c
-gpu_nvidia_la_CPPFLAGS = $(
PLUGIN_CPPFLAGS) $(BUILD_WITH_GPU
_CUDA_CPPFLAGS)
-gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_
GPU_
CUDA_LDFLAGS)
+gpu_nvidia_la_CPPFLAGS = $(
AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(BUILD_WITH
_CUDA_CPPFLAGS)
+gpu_nvidia_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_CUDA_LDFLAGS)
gpu_nvidia_la_LIBADD = $(BUILD_WITH_CUDA_LIBS)
endif
gpu_nvidia_la_LIBADD = $(BUILD_WITH_CUDA_LIBS)
endif
@@
-1414,6
+1420,12
@@
test_plugin_network_LDADD = \
libplugin_mock.la \
libmetadata.la \
$(GCRYPT_LIBS)
libplugin_mock.la \
libmetadata.la \
$(GCRYPT_LIBS)
+if BUILD_WITH_LIBSOCKET
+test_plugin_network_LDADD += -lsocket
+endif
+if BUILD_WITH_LIBNSL
+test_plugin_network_LDADD += -lnsl
+endif
check_PROGRAMS += test_plugin_network
endif
check_PROGRAMS += test_plugin_network
endif