diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 92 |
1 files changed, 59 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 3eaf1ee8c..7d9abd549 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,6 +37,8 @@ EXTRA_DIST = \ build/m4/ax_c_mallopt.m4 \ build/m4/tcmalloc.m4 \ build/m4/ax_c__generic.m4 \ + build/m4/ax_compiler_vendor.m4 \ + build/m4/ax_cxx_compile_stdcxx.m4 \ ml/dlib \ README.md \ LICENSE \ @@ -73,11 +75,14 @@ dist_noinst_DATA = \ packaging/installer/UPDATE.md \ packaging/jsonc.checksums \ packaging/jsonc.version \ + packaging/yaml.checksums \ + packaging/yaml.version \ packaging/libbpf.checksums \ packaging/libbpf.version \ packaging/protobuf.checksums \ packaging/protobuf.version \ packaging/version \ + database/engine/journalfile_v2.ksy.in \ $(NULL) # until integrated within build @@ -106,7 +111,6 @@ SUBDIRS += \ streaming \ web \ claim \ - parser \ spawn \ $(NULL) @@ -117,6 +121,7 @@ AM_CFLAGS = \ $(OPTIONAL_UUID_CFLAGS) \ $(OPTIONAL_MQTT_CFLAGS) \ $(OPTIONAL_LIBCAP_LIBS) \ + $(OPTIONAL_DATACHANNEL_CFLAGS) \ $(OPTIONAL_IPMIMONITORING_CFLAGS) \ $(OPTIONAL_CUPS_CFLAGS) \ $(OPTIONAL_XENSTAT_CFLAGS) \ @@ -159,6 +164,8 @@ LIBNETDATA_FILES = \ libnetdata/log/log.h \ libnetdata/onewayalloc/onewayalloc.c \ libnetdata/onewayalloc/onewayalloc.h \ + libnetdata/parser/parser.c \ + libnetdata/parser/parser.h \ libnetdata/popen/popen.c \ libnetdata/popen/popen.h \ libnetdata/procfile/procfile.c \ @@ -233,37 +240,18 @@ ML_FILES = \ if ENABLE_ML ML_FILES += \ - ml/ADCharts.h \ - ml/ADCharts.cc \ - ml/Config.h \ + ml/ad_charts.h \ + ml/ad_charts.cc \ ml/Config.cc \ - ml/Chart.cc \ - ml/Chart.h \ - ml/Stats.h \ - ml/Dimension.cc \ - ml/Dimension.h \ - ml/Host.h \ - ml/Host.cc \ - ml/Mutex.h \ - ml/Queue.h \ - ml/Query.h \ - ml/KMeans.h \ - ml/KMeans.cc \ - ml/SamplesBuffer.h \ - ml/SamplesBuffer.cc \ ml/dlib/dlib/all/source.cpp \ - ml/json/single_include/nlohmann/json.hpp \ - ml/ml.cc \ ml/ml-private.h \ + ml/ml.cc \ $(NULL) # Disable warnings from dlib library ml/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow -Wno-psabi # Disable ml warnings -ml/Dimension.$(OBJEXT) : CXXFLAGS += -Wno-psabi -ml/Host.$(OBJEXT) : CXXFLAGS += -Wno-psabi -ml/KMeans.$(OBJEXT) : CXXFLAGS += -Wno-psabi ml/ml.$(OBJEXT) : CXXFLAGS += -Wno-psabi endif @@ -425,12 +413,21 @@ PLUGINSD_PLUGIN_FILES = \ $(NULL) RRD_PLUGIN_FILES = \ + database/contexts/rrdcontext.c \ + database/contexts/rrdcontext.h \ + database/contexts/metric.c \ + database/contexts/instance.c \ + database/contexts/context.c \ + database/contexts/worker.c \ + database/contexts/query_target.c \ + database/contexts/query_scope.c \ + database/contexts/api_v1.c \ + database/contexts/api_v2.c \ + database/contexts/internal.h \ database/rrdcalc.c \ database/rrdcalc.h \ database/rrdcalctemplate.c \ database/rrdcalctemplate.h \ - database/rrdcontext.c \ - database/rrdcontext.h \ database/rrddim.c \ database/rrddimvar.c \ database/rrddimvar.h \ @@ -555,6 +552,20 @@ if ENABLE_DBENGINE database/engine/pdc.c \ database/engine/pdc.h \ $(NULL) + + RRD_PLUGIN_KSY_BUILTFILES = \ + database/engine/journalfile_v2.ksy \ + database/engine/journalfile_v2_virtmemb.ksy \ + $(NULL) + + BUILT_SOURCES += $(RRD_PLUGIN_KSY_BUILTFILES) + CLEANFILES += $(RRD_PLUGIN_KSY_BUILTFILES) + +database/engine/journalfile_v2.ksy: $(abs_top_srcdir)/database/engine/journalfile_v2.ksy.in + m4 $(abs_top_srcdir)/database/engine/journalfile_v2.ksy.in > $@ + +database/engine/journalfile_v2_virtmemb.ksy: $(abs_top_srcdir)/database/engine/journalfile_v2.ksy.in + m4 -DVIRT_MEMBERS $(abs_top_srcdir)/database/engine/journalfile_v2.ksy.in > $@ endif API_PLUGIN_FILES = \ @@ -612,8 +623,12 @@ API_PLUGIN_FILES = \ web/api/formatters/rrdset2json.h \ web/api/health/health_cmdapi.c \ web/api/health/health_cmdapi.h \ + web/api/web_api.c \ + web/api/web_api.h \ web/api/web_api_v1.c \ web/api/web_api_v1.h \ + web/api/web_api_v2.c \ + web/api/web_api_v2.h \ $(NULL) STREAMING_PLUGIN_FILES = \ @@ -647,6 +662,8 @@ STATSD_PLUGIN_FILES = \ $(NULL) WEB_PLUGIN_FILES = \ + web/rtc/webrtc.c \ + web/rtc/webrtc.h \ web/server/web_client.c \ web/server/web_client.h \ web/server/web_server.c \ @@ -662,11 +679,6 @@ CLAIM_FILES = \ claim/claim.h \ $(NULL) -PARSER_FILES = \ - parser/parser.c \ - parser/parser.h \ - $(NULL) - if ENABLE_ACLK ACLK_FILES = \ aclk/aclk_util.c \ @@ -689,8 +701,6 @@ ACLK_FILES = \ aclk/aclk_alarm_api.h \ aclk/aclk_contexts_api.c \ aclk/aclk_contexts_api.h \ - aclk/aclk_capas.c \ - aclk/aclk_capas.h \ aclk/helpers/mqtt_wss_pal.h \ aclk/helpers/ringbuffer_pal.h \ aclk/schema-wrappers/connection.cc \ @@ -716,6 +726,8 @@ ACLK_FILES = \ aclk/schema-wrappers/context_stream.h \ aclk/schema-wrappers/context.cc \ aclk/schema-wrappers/context.h \ + aclk/schema-wrappers/agent_cmds.cc \ + aclk/schema-wrappers/agent_cmds.h \ $(NULL) noinst_LIBRARIES += libmqttwebsockets.a @@ -758,6 +770,7 @@ ACLK_PROTO_DEFINITIONS = \ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto \ aclk/aclk-schemas/proto/context/v1/context.proto \ aclk/aclk-schemas/proto/context/v1/stream.proto \ + aclk/aclk-schemas/proto/agent/v1/cmds.proto \ $(NULL) dist_noinst_DATA += $(ACLK_PROTO_DEFINITIONS) @@ -782,6 +795,8 @@ ACLK_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \ aclk/aclk-schemas/proto/context/v1/context.pb.h \ aclk/aclk-schemas/proto/context/v1/stream.pb.cc \ aclk/aclk-schemas/proto/context/v1/stream.pb.h \ + aclk/aclk-schemas/proto/agent/v1/cmds.pb.cc \ + aclk/aclk-schemas/proto/agent/v1/cmds.pb.h \ $(NULL) BUILT_SOURCES += $(ACLK_PROTO_BUILT_FILES) @@ -828,6 +843,10 @@ aclk/aclk-schemas/proto/context/v1/stream.pb.cc \ aclk/aclk-schemas/proto/context/v1/stream.pb.h: aclk/aclk-schemas/proto/context/v1/stream.proto $(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^ +aclk/aclk-schemas/proto/agent/v1/cmds.pb.cc \ +aclk/aclk-schemas/proto/agent/v1/cmds.pb.h: aclk/aclk-schemas/proto/agent/v1/cmds.proto + $(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^ + endif #ENABLE_ACLK ACLK_ALWAYS_BUILD_FILES = \ @@ -836,6 +855,8 @@ ACLK_ALWAYS_BUILD_FILES = \ aclk/aclk_proxy.h \ aclk/aclk.c \ aclk/aclk.h \ + aclk/aclk_capas.c \ + aclk/aclk_capas.h \ $(NULL) SPAWN_PLUGIN_FILES = \ @@ -934,7 +955,6 @@ NETDATA_FILES = \ $(STATSD_PLUGIN_FILES) \ $(WEB_PLUGIN_FILES) \ $(CLAIM_FILES) \ - $(PARSER_FILES) \ $(ACLK_ALWAYS_BUILD_FILES) \ $(ACLK_FILES) \ $(SPAWN_PLUGIN_FILES) \ @@ -974,9 +994,11 @@ NETDATA_COMMON_LIBS = \ $(OPTIONAL_MQTT_LIBS) \ $(OPTIONAL_UV_LIBS) \ $(OPTIONAL_LZ4_LIBS) \ + $(OPTIONAL_DATACHANNEL_LIBS) \ libjudy.a \ $(OPTIONAL_SSL_LIBS) \ $(OPTIONAL_JSONC_LIBS) \ + $(OPTIONAL_YAML_LIBS) \ $(OPTIONAL_ATOMIC_LIBS) \ $(OPTIONAL_DL_LIBS) \ $(NULL) @@ -989,6 +1011,10 @@ if LINK_STATIC_JSONC NETDATA_COMMON_LIBS += $(abs_top_srcdir)/externaldeps/jsonc/libjson-c.a endif +if LINK_STATIC_YAML + NETDATA_COMMON_LIBS += $(abs_top_srcdir)/externaldeps/libyaml/libyaml.a +endif + NETDATACLI_FILES = \ daemon/commands.h \ $(LIBNETDATA_FILES) \ |