diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-31 12:59:21 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-31 12:59:21 +0000 |
| commit | bb8713bbc1c4594366fc735c04910edbf4c61aab (patch) | |
| tree | d7da56c0b89aa371dd8ad986995dd145fdf6670a /Makefile.am | |
| parent | Releasing debian version 1.29.3-4. (diff) | |
| download | netdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.tar.xz netdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.zip | |
Merging upstream version 1.30.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 62 |
1 files changed, 52 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 1846d1e1..180d337c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,10 +116,18 @@ SUBDIRS += \ web \ claim \ parser \ - aclk/legacy \ spawn \ $(NULL) +if ACLK_NG +SUBDIRS += \ + mqtt_websockets \ + $(NULL) +else +SUBDIRS += \ + aclk/legacy \ + $(NULL) +endif AM_CFLAGS = \ $(OPTIONAL_MATH_CFLAGS) \ @@ -281,10 +289,14 @@ PERF_PLUGIN_FILES = \ EBPF_PLUGIN_FILES = \ collectors/ebpf.plugin/ebpf.c \ + collectors/ebpf.plugin/ebpf_cachestat.c \ + collectors/ebpf.plugin/ebpf_cachestat.h \ collectors/ebpf.plugin/ebpf_process.c \ collectors/ebpf.plugin/ebpf_process.h \ collectors/ebpf.plugin/ebpf_socket.c \ collectors/ebpf.plugin/ebpf_socket.h \ + collectors/ebpf.plugin/ebpf_sync.c \ + collectors/ebpf.plugin/ebpf_sync.h \ collectors/ebpf.plugin/ebpf.h \ collectors/ebpf.plugin/ebpf_apps.c \ collectors/ebpf.plugin/ebpf_apps.h \ @@ -374,14 +386,14 @@ RRD_PLUGIN_FILES = \ database/rrdsetvar.h \ database/rrdvar.c \ database/rrdvar.h \ + database/sqlite/sqlite_functions.c \ + database/sqlite/sqlite_functions.h \ + database/sqlite/sqlite3.c \ + database/sqlite/sqlite3.h \ $(NULL) if ENABLE_DBENGINE RRD_PLUGIN_FILES += \ - database/sqlite/sqlite_functions.c \ - database/sqlite/sqlite_functions.h \ - database/sqlite/sqlite3.c \ - database/sqlite/sqlite3.h \ database/engine/rrdengine.c \ database/engine/rrdengine.h \ database/engine/rrddiskprotocol.h \ @@ -523,6 +535,30 @@ PARSER_FILES = \ parser/parser.h \ $(NULL) +if ACLK_NG +ACLK_FILES = \ + aclk/aclk.c \ + aclk/aclk.h \ + aclk/aclk_util.c \ + aclk/aclk_util.h \ + aclk/aclk_stats.c \ + aclk/aclk_stats.h \ + aclk/aclk_query.c \ + aclk/aclk_query.h \ + aclk/aclk_query_queue.c \ + aclk/aclk_query_queue.h \ + aclk/aclk_collector_list.c \ + aclk/aclk_collector_list.h \ + aclk/aclk_otp.c \ + aclk/aclk_otp.h \ + aclk/aclk_tx_msgs.c \ + aclk/aclk_tx_msgs.h \ + aclk/aclk_rx_msgs.c \ + aclk/aclk_rx_msgs.h \ + aclk/https_client.c \ + aclk/https_client.h \ + $(NULL) +else #ACLK_NG ACLK_FILES = \ aclk/legacy/aclk_rrdhost_state.h \ aclk/legacy/aclk_common.c \ @@ -546,9 +582,8 @@ ACLK_FILES += \ aclk/legacy/aclk_lws_https_client.c \ aclk/legacy/aclk_lws_https_client.h \ $(NULL) -endif - - +endif #ENABLE_ACLK +endif #ACLK_NG SPAWN_PLUGIN_FILES = \ spawn/spawn.c \ @@ -712,6 +747,12 @@ NETDATACLI_FILES = \ sbin_PROGRAMS += netdata netdata_SOURCES = $(NETDATA_FILES) +if ACLK_NG +netdata_LDADD = \ + mqtt_websockets/libmqttwebsockets.a \ + $(NETDATA_COMMON_LIBS) \ + $(NULL) +else #ACLK_NG if ENABLE_ACLK netdata_LDADD = \ externaldeps/mosquitto/libmosquitto.a \ @@ -719,11 +760,12 @@ netdata_LDADD = \ $(OPTIONAL_LWS_LIBS) \ $(NETDATA_COMMON_LIBS) \ $(NULL) -else +else #ENABLE_ACLK netdata_LDADD = \ $(NETDATA_COMMON_LIBS) \ $(NULL) -endif +endif #ENABLE_ACLK +endif #ACLK_NG if ENABLE_CXX_LINKER netdata_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ |