diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile.am | 85 |
1 files changed, 22 insertions, 63 deletions
diff --git a/Makefile.am b/Makefile.am index 5b1c7a31..c41e8db2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,8 +64,6 @@ dist_noinst_DATA = \ packaging/bundle-ebpf.sh \ packaging/bundle-judy.sh \ packaging/bundle-libbpf.sh \ - packaging/bundle-lws.sh \ - packaging/bundle-mosquitto.sh \ packaging/check-kernel-config.sh \ packaging/ebpf.checksums \ packaging/ebpf.version \ @@ -80,10 +78,6 @@ dist_noinst_DATA = \ packaging/judy.version \ packaging/libbpf.checksums \ packaging/libbpf.version \ - packaging/libwebsockets.checksums \ - packaging/libwebsockets.version \ - packaging/mosquitto.checksums \ - packaging/mosquitto.version \ packaging/protobuf.checksums \ packaging/protobuf.version \ packaging/version \ @@ -121,12 +115,6 @@ SUBDIRS += \ ml \ $(NULL) -if ENABLE_ACLK -SUBDIRS += \ - aclk/legacy \ - $(NULL) -endif - AM_CFLAGS = \ $(OPTIONAL_MATH_CFLAGS) \ $(OPTIONAL_NFACCT_CFLAGS) \ @@ -156,6 +144,8 @@ LIBNETDATA_FILES = \ libnetdata/circular_buffer/circular_buffer.h \ libnetdata/clocks/clocks.c \ libnetdata/clocks/clocks.h \ + libnetdata/completion/completion.c \ + libnetdata/completion/completion.h \ libnetdata/dictionary/dictionary.c \ libnetdata/dictionary/dictionary.h \ libnetdata/eval/eval.c \ @@ -211,7 +201,6 @@ APPS_PLUGIN_FILES = \ CHECKS_PLUGIN_FILES = \ collectors/checks.plugin/plugin_checks.c \ - collectors/checks.plugin/plugin_checks.h \ $(NULL) FREEBSD_PLUGIN_FILES = \ @@ -281,7 +270,6 @@ endif IDLEJITTER_PLUGIN_FILES = \ collectors/idlejitter.plugin/plugin_idlejitter.c \ - collectors/idlejitter.plugin/plugin_idlejitter.h \ $(NULL) CGROUPS_PLUGIN_FILES = \ @@ -295,12 +283,10 @@ CGROUP_NETWORK_FILES = \ $(NULL) DISKSPACE_PLUGIN_FILES = \ - collectors/diskspace.plugin/plugin_diskspace.h \ collectors/diskspace.plugin/plugin_diskspace.c \ $(NULL) TIMEX_PLUGIN_FILES = \ - collectors/timex.plugin/plugin_timex.h \ collectors/timex.plugin/plugin_timex.c \ $(NULL) @@ -423,7 +409,6 @@ PROC_PLUGIN_FILES = \ TC_PLUGIN_FILES = \ collectors/tc.plugin/plugin_tc.c \ - collectors/tc.plugin/plugin_tc.h \ $(NULL) MACOS_PLUGIN_FILES = \ @@ -558,6 +543,7 @@ API_PLUGIN_FILES = \ STREAMING_PLUGIN_FILES = \ streaming/rrdpush.c \ + streaming/compression.c \ streaming/sender.c \ streaming/receiver.c \ streaming/rrdpush.h \ @@ -581,7 +567,6 @@ REGISTRY_PLUGIN_FILES = \ STATSD_PLUGIN_FILES = \ collectors/statsd.plugin/statsd.c \ - collectors/statsd.plugin/statsd.h \ $(NULL) WEB_PLUGIN_FILES = \ @@ -618,8 +603,8 @@ PARSER_FILES = \ parser/parser.h \ $(NULL) -if ACLK_NG -ACLK_NG_FILES = \ +if ENABLE_ACLK +ACLK_FILES = \ aclk/aclk.c \ aclk/aclk.h \ aclk/aclk_util.c \ @@ -652,7 +637,7 @@ ACLK_NG_FILES = \ $(NULL) if ENABLE_NEW_CLOUD_PROTOCOL -ACLK_NG_FILES += \ +ACLK_FILES += \ aclk/aclk_charts_api.c \ aclk/aclk_charts_api.h \ aclk/aclk_alarm_api.c \ @@ -678,7 +663,7 @@ ACLK_NG_FILES += \ aclk/schema-wrappers/schema_wrapper_utils.h \ $(NULL) -ACLK_NG_PROTO_DEFINITIONS = \ +ACLK_PROTO_DEFINITIONS = \ aclk/aclk-schemas/proto/aclk/v1/lib.proto \ aclk/aclk-schemas/proto/agent/v1/disconnect.proto \ aclk/aclk-schemas/proto/agent/v1/connection.proto \ @@ -693,9 +678,9 @@ ACLK_NG_PROTO_DEFINITIONS = \ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto \ $(NULL) -dist_noinst_DATA += $(ACLK_NG_PROTO_DEFINITIONS) +dist_noinst_DATA += $(ACLK_PROTO_DEFINITIONS) -ACLK_NG_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \ +ACLK_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \ aclk/aclk-schemas/proto/agent/v1/connection.pb.h \ aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.cc \ aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.h \ @@ -721,9 +706,9 @@ ACLK_NG_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h \ $(NULL) -BUILT_SOURCES += $(ACLK_NG_PROTO_BUILT_FILES) -nodist_netdata_SOURCES += $(ACLK_NG_PROTO_BUILT_FILES) -CLEANFILES += $(ACLK_NG_PROTO_BUILT_FILES) +BUILT_SOURCES += $(ACLK_PROTO_BUILT_FILES) +nodist_netdata_SOURCES += $(ACLK_PROTO_BUILT_FILES) +CLEANFILES += $(ACLK_PROTO_BUILT_FILES) aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \ aclk/aclk-schemas/proto/agent/v1/connection.pb.h: aclk/aclk-schemas/proto/agent/v1/connection.proto @@ -775,7 +760,7 @@ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h: aclk/aclk-schemas/proto/ endif #ENABLE_NEW_CLOUD_PROTOCOL -endif #ACLK_NG +endif #ENABLE_ACLK if ENABLE_ACLK ACLK_COMMON_FILES = \ @@ -792,27 +777,6 @@ ACLK_ALWAYS_BUILD_FILES = \ aclk/aclk_proxy.h \ $(NULL) -if ACLK_LEGACY -ACLK_LEGACY_FILES = \ - aclk/legacy/agent_cloud_link.c \ - aclk/legacy/agent_cloud_link.h \ - aclk/legacy/aclk_query.c \ - aclk/legacy/aclk_query.h \ - aclk/legacy/mqtt.c \ - aclk/legacy/mqtt.h \ - aclk/legacy/aclk_rx_msgs.c \ - aclk/legacy/aclk_rx_msgs.h \ - aclk/legacy/aclk_lws_wss_client.c \ - aclk/legacy/aclk_lws_wss_client.h \ - aclk/legacy/aclk_lws_https_client.c \ - aclk/legacy/aclk_lws_https_client.h \ - aclk/legacy/aclk_common.c \ - aclk/legacy/aclk_common.h \ - aclk/legacy/aclk_stats.c \ - aclk/legacy/aclk_stats.h \ - $(NULL) -endif #ACLK_LEGACY - SPAWN_PLUGIN_FILES = \ spawn/spawn.c \ spawn/spawn_server.c \ @@ -900,7 +864,8 @@ DAEMON_FILES = \ daemon/signals.c \ daemon/signals.h \ daemon/service.c \ - daemon/service.h \ + daemon/static_threads.h \ + daemon/static_threads.c \ daemon/commands.c \ daemon/commands.h \ daemon/unit_test.c \ @@ -929,32 +894,33 @@ NETDATA_FILES = \ $(PARSER_FILES) \ $(ACLK_ALWAYS_BUILD_FILES) \ $(ACLK_COMMON_FILES) \ - $(ACLK_LEGACY_FILES) \ - $(ACLK_NG_FILES) \ + $(ACLK_FILES) \ $(SPAWN_PLUGIN_FILES) \ $(NULL) if FREEBSD NETDATA_FILES += \ + daemon/static_threads_freebsd.c \ $(FREEBSD_PLUGIN_FILES) \ $(NULL) endif if MACOS NETDATA_FILES += \ + daemon/static_threads_macos.c \ $(MACOS_PLUGIN_FILES) \ $(NULL) endif if LINUX NETDATA_FILES += \ + daemon/static_threads_linux.c \ $(CGROUPS_PLUGIN_FILES) \ $(DISKSPACE_PLUGIN_FILES) \ $(TIMEX_PLUGIN_FILES) \ $(PROC_PLUGIN_FILES) \ $(TC_PLUGIN_FILES) \ $(NULL) - endif NETDATA_COMMON_LIBS = \ @@ -994,9 +960,10 @@ netdata_LDADD = \ $(NETDATA_COMMON_LIBS) \ $(NULL) -if ACLK_NG +if ENABLE_ACLK netdata_LDADD += $(OPTIONAL_PROTOBUF_LIBS) \ - $(NULL) + $(OPTIONAL_ATOMIC_LIBS) \ + $(NULL) endif if ENABLE_ML_TESTS @@ -1004,14 +971,6 @@ if ENABLE_ML_TESTS $(NULL) endif -if ACLK_LEGACY - netdata_LDADD += \ - $(abs_top_srcdir)/externaldeps/mosquitto/libmosquitto.a \ - $(OPTIONAL_LWS_LIBS) \ - $(OPTIONAL_LIBCAP_LIBS) \ - $(NULL) -endif #ACLK_LEGACY - if ENABLE_CXX_LINKER netdata_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ else |