From 00151562145df50cc65e9902d52d5fa77f89fe50 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 9 Jun 2022 06:52:47 +0200 Subject: Merging upstream version 1.35.0. Signed-off-by: Daniel Baumann --- Makefile.am | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 0aa4d639e..6241fc102 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,6 @@ EXTRA_DIST = \ .eslintrc \ .github/CODEOWNERS \ build/m4/jemalloc.m4 \ - build/m4/ax_c___atomic.m4 \ build/m4/ax_check_enable_debug.m4 \ build/m4/ax_c_mallinfo.m4 \ build/m4/ax_gcc_func_attribute.m4 \ @@ -159,6 +158,8 @@ LIBNETDATA_FILES = \ libnetdata/locks/locks.h \ libnetdata/log/log.c \ libnetdata/log/log.h \ + libnetdata/onewayalloc/onewayalloc.c \ + libnetdata/onewayalloc/onewayalloc.h \ libnetdata/popen/popen.c \ libnetdata/popen/popen.h \ libnetdata/procfile/procfile.c \ @@ -186,6 +187,8 @@ LIBNETDATA_FILES = \ libnetdata/health/health.c \ libnetdata/health/health.h \ libnetdata/string/utf8.h \ + libnetdata/worker_utilization/worker_utilization.c \ + libnetdata/worker_utilization/worker_utilization.h \ $(NULL) if ENABLE_PLUGIN_EBPF @@ -445,6 +448,10 @@ RRD_PLUGIN_FILES = \ database/rrdsetvar.h \ database/rrdvar.c \ database/rrdvar.h \ + database/storage_engine.c \ + database/storage_engine.h \ + database/ram/rrddim_mem.c \ + database/ram/rrddim_mem.h \ database/sqlite/sqlite_functions.c \ database/sqlite/sqlite_functions.h \ database/sqlite/sqlite_aclk.c \ @@ -459,6 +466,10 @@ RRD_PLUGIN_FILES = \ database/sqlite/sqlite_aclk_alert.h \ database/sqlite/sqlite3.c \ database/sqlite/sqlite3.h \ + database/KolmogorovSmirnovDist.c \ + database/KolmogorovSmirnovDist.h \ + database/metric_correlations.c \ + database/metric_correlations.h \ $(NULL) if ENABLE_DBENGINE @@ -617,6 +628,11 @@ ACLK_FILES = \ mqtt_websockets/src/include/mqtt_wss_log.h \ mqtt_websockets/src/ws_client.c \ mqtt_websockets/src/include/ws_client.h \ + mqtt_websockets/src/mqtt_ng.c \ + mqtt_websockets/src/include/mqtt_ng.h \ + mqtt_websockets/src/common_public.c \ + mqtt_websockets/src/include/common_public.h \ + mqtt_websockets/src/include/common_internal.h \ mqtt_websockets/c-rbuf/src/ringbuffer.c \ mqtt_websockets/c-rbuf/include/ringbuffer.h \ mqtt_websockets/c-rbuf/src/ringbuffer_internal.h \ @@ -646,6 +662,8 @@ ACLK_FILES += \ aclk/schema-wrappers/alarm_config.h \ aclk/schema-wrappers/node_info.cc \ aclk/schema-wrappers/node_info.h \ + aclk/schema-wrappers/capability.cc \ + aclk/schema-wrappers/capability.h \ aclk/schema-wrappers/schema_wrappers.h \ aclk/schema-wrappers/schema_wrapper_utils.cc \ aclk/schema-wrappers/schema_wrapper_utils.h \ @@ -941,22 +959,15 @@ if ENABLE_ML_TESTS $(NULL) endif -if ENABLE_CXX_LINKER - netdata_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ -else - netdata_LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ -endif +netdata_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ sbin_PROGRAMS += netdatacli netdatacli_SOURCES = $(NETDATACLI_FILES) netdatacli_LDADD = \ $(NETDATA_COMMON_LIBS) \ $(NULL) -if ENABLE_CXX_LINKER - netdatacli_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ -else - netdatacli_LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ -endif + +netdatacli_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ if ENABLE_PLUGIN_APPS plugins_PROGRAMS += apps.plugin -- cgit v1.2.3