From 6d2e027eb728c8294fdd7c3692e9853b3ca2603b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 21 Feb 2019 20:34:08 +0100 Subject: Merging upstream version 1.12.1. Signed-off-by: Daniel Baumann --- Makefile.am | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 376ccf178..15777dd2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -221,7 +221,7 @@ CUPS_PLUGIN_FILES = \ NFACCT_PLUGIN_FILES = \ collectors/nfacct.plugin/plugin_nfacct.c \ - collectors/nfacct.plugin/plugin_nfacct.h \ + $(LIBNETDATA_FILES) \ $(NULL) PROC_PLUGIN_FILES = \ @@ -449,7 +449,6 @@ if LINUX NETDATA_FILES += \ $(CGROUPS_PLUGIN_FILES) \ $(DISKSPACE_PLUGIN_FILES) \ - $(NFACCT_PLUGIN_FILES) \ $(PROC_PLUGIN_FILES) \ $(TC_PLUGIN_FILES) \ $(NULL) @@ -467,7 +466,6 @@ sbin_PROGRAMS += netdata netdata_SOURCES = $(NETDATA_FILES) netdata_LDADD = \ $(NETDATA_COMMON_LIBS) \ - $(OPTIONAL_NFACCT_LIBS) \ $(NULL) if ENABLE_PLUGIN_APPS @@ -504,3 +502,12 @@ if ENABLE_PLUGIN_CUPS $(OPTIONAL_CUPS_LIBS) \ $(NULL) endif + +if ENABLE_PLUGIN_NFACCT + plugins_PROGRAMS += nfacct.plugin + nfacct_plugin_SOURCES = $(NFACCT_PLUGIN_FILES) + nfacct_plugin_LDADD = \ + $(NETDATA_COMMON_LIBS) \ + $(OPTIONAL_NFACCT_LIBS) \ + $(NULL) +endif -- cgit v1.2.3