New upstream version 1.6.0+dfsgupstream/1.6.0+dfsg

1 files changed, 232 insertions, 294 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index f9464636..d7229d18 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,61 +17,6 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -90,23 +36,29 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 sbin_PROGRAMS = netdata$(EXEEXT)
-@MACOS_FALSE@plugins_PROGRAMS = apps.plugin$(EXEEXT)
-@FREEBSD_TRUE@am__append_1 = \
-@FREEBSD_TRUE@	plugin_freebsd.c plugin_freebsd.h \
+plugins_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+@ENABLE_PLUGIN_APPS_TRUE@am__append_1 = apps.plugin
+@ENABLE_PLUGIN_FREEIPMI_TRUE@am__append_2 = freeipmi.plugin
+@FREEBSD_TRUE@am__append_3 = \
+@FREEBSD_TRUE@	plugin_freebsd.c \
+@FREEBSD_TRUE@	plugin_freebsd.h \
 @FREEBSD_TRUE@	freebsd_sysctl.c \
 @FREEBSD_TRUE@	$(NULL)
 
-@FREEBSD_FALSE@@MACOS_TRUE@am__append_2 = \
-@FREEBSD_FALSE@@MACOS_TRUE@	plugin_macos.c plugin_macos.h \
+@FREEBSD_FALSE@@MACOS_TRUE@am__append_4 = \
+@FREEBSD_FALSE@@MACOS_TRUE@	plugin_macos.c \
+@FREEBSD_FALSE@@MACOS_TRUE@	plugin_macos.h \
 @FREEBSD_FALSE@@MACOS_TRUE@	macos_sysctl.c \
 @FREEBSD_FALSE@@MACOS_TRUE@	macos_mach_smi.c \
 @FREEBSD_FALSE@@MACOS_TRUE@	macos_fw.c \
 @FREEBSD_FALSE@@MACOS_TRUE@	$(NULL)
 
-@FREEBSD_FALSE@@MACOS_FALSE@am__append_3 = \
+@FREEBSD_FALSE@@MACOS_FALSE@am__append_5 = \
 @FREEBSD_FALSE@@MACOS_FALSE@	ipc.c ipc.h \
-@FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc.c plugin_proc.h \
-@FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc_diskspace.c plugin_proc_diskspace.h \
+@FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc.c \
+@FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc.h \
+@FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc_diskspace.c \
+@FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc_diskspace.h \
 @FREEBSD_FALSE@@MACOS_FALSE@	proc_diskstats.c \
 @FREEBSD_FALSE@@MACOS_FALSE@	proc_interrupts.c \
 @FREEBSD_FALSE@@MACOS_FALSE@	proc_softirqs.c \
@@ -129,10 +81,17 @@ sbin_PROGRAMS = netdata$(EXEEXT)
 @FREEBSD_FALSE@@MACOS_FALSE@	sys_kernel_mm_ksm.c \
 @FREEBSD_FALSE@@MACOS_FALSE@	$(NULL)
 
+@FREEBSD_TRUE@am__append_6 = \
+@FREEBSD_TRUE@	plugin_freebsd.h \
+@FREEBSD_TRUE@	$(NULL)
+
 subdir = src
+DIST_COMMON = $(dist_cache_DATA) $(dist_log_DATA) \
+	$(dist_registry_DATA) $(dist_varlib_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_c___atomic.m4 \
-	$(top_srcdir)/m4/ax_c__generic.m4 \
+	$(top_srcdir)/m4/ax_c__generic.m4 $(top_srcdir)/m4/ax_c_lto.m4 \
 	$(top_srcdir)/m4/ax_c_mallinfo.m4 \
 	$(top_srcdir)/m4/ax_c_mallopt.m4 \
 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -141,43 +100,56 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_c___atomic.m4 \
 	$(top_srcdir)/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(dist_cache_DATA) \
-	$(dist_log_DATA) $(dist_registry_DATA) $(dist_varlib_DATA) \
-	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@ENABLE_PLUGIN_APPS_TRUE@am__EXEEXT_1 = apps.plugin$(EXEEXT)
+@ENABLE_PLUGIN_FREEIPMI_TRUE@am__EXEEXT_2 = freeipmi.plugin$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(sbindir)" \
 	"$(DESTDIR)$(cachedir)" "$(DESTDIR)$(logdir)" \
 	"$(DESTDIR)$(registrydir)" "$(DESTDIR)$(varlibdir)"
 PROGRAMS = $(plugins_PROGRAMS) $(sbin_PROGRAMS)
+am__apps_plugin_SOURCES_DIST = apps_plugin.c avl.c avl.h clocks.c \
+	clocks.h common.c common.h inlined.h log.c log.h procfile.c \
+	procfile.h web_buffer.c web_buffer.h plugin_freebsd.h
+am__objects_1 =
 am_apps_plugin_OBJECTS = apps_plugin.$(OBJEXT) avl.$(OBJEXT) \
 	clocks.$(OBJEXT) common.$(OBJEXT) log.$(OBJEXT) \
-	procfile.$(OBJEXT) web_buffer.$(OBJEXT)
+	procfile.$(OBJEXT) web_buffer.$(OBJEXT) $(am__objects_1)
 apps_plugin_OBJECTS = $(am_apps_plugin_OBJECTS)
-apps_plugin_LDADD = $(LDADD)
-am__netdata_SOURCES_DIST = appconfig.c appconfig.h \
-	adaptive_resortable_list.c adaptive_resortable_list.h avl.c \
-	avl.h backends.c backends.h clocks.c clocks.h common.c \
-	common.h daemon.c daemon.h dictionary.c dictionary.h eval.c \
-	eval.h global_statistics.c global_statistics.h health.c \
-	health.h inlined.h log.c log.h main.c main.h plugin_checks.c \
-	plugin_checks.h plugin_idlejitter.c plugin_idlejitter.h \
-	plugin_nfacct.c plugin_nfacct.h plugin_tc.c plugin_tc.h \
-	plugins_d.c plugins_d.h popen.c popen.h socket.c socket.h \
-	simple_pattern.c simple_pattern.h sys_fs_cgroup.c \
-	sys_devices_system_edac_mc.c sys_devices_system_node.c \
-	procfile.c procfile.h proc_self_mountinfo.c \
-	proc_self_mountinfo.h registry.c registry.h \
-	registry_internals.c registry_internals.h registry_url.c \
-	registry_url.h registry_person.c registry_person.h \
-	registry_machine.c registry_machine.h registry_init.c \
-	registry_db.c registry_log.c rrd.c rrd.h rrd2json.c rrd2json.h \
-	storage_number.c storage_number.h unit_test.c unit_test.h \
-	url.c url.h web_buffer.c web_buffer.h web_buffer_svg.c \
-	web_buffer_svg.h web_client.c web_client.h web_server.c \
-	web_server.h plugin_freebsd.c plugin_freebsd.h \
+am__DEPENDENCIES_1 =
+apps_plugin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_freeipmi_plugin_OBJECTS = freeipmi_plugin.$(OBJEXT) \
+	clocks.$(OBJEXT) common.$(OBJEXT) log.$(OBJEXT) \
+	procfile.$(OBJEXT)
+freeipmi_plugin_OBJECTS = $(am_freeipmi_plugin_OBJECTS)
+freeipmi_plugin_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__netdata_SOURCES_DIST = adaptive_resortable_list.c \
+	adaptive_resortable_list.h appconfig.c appconfig.h avl.c avl.h \
+	backends.c backends.h clocks.c clocks.h common.c common.h \
+	daemon.c daemon.h dictionary.c dictionary.h eval.c eval.h \
+	global_statistics.c global_statistics.h health.c health.h \
+	health_config.c health_json.c health_log.c inlined.h locks.h \
+	log.c log.h main.c main.h plugin_checks.c plugin_checks.h \
+	plugin_idlejitter.c plugin_idlejitter.h plugin_nfacct.c \
+	plugin_nfacct.h plugin_tc.c plugin_tc.h plugins_d.c \
+	plugins_d.h popen.c popen.h proc_self_mountinfo.c \
+	proc_self_mountinfo.h procfile.c procfile.h registry.c \
+	registry.h registry_db.c registry_init.c registry_internals.c \
+	registry_internals.h registry_log.c registry_machine.c \
+	registry_machine.h registry_person.c registry_person.h \
+	registry_url.c registry_url.h rrd.c rrd.h rrd2json.c \
+	rrd2json.h rrd2json_api_old.c rrd2json_api_old.h rrdcalc.c \
+	rrdcalctemplate.c rrddim.c rrddimvar.c rrdfamily.c rrdhost.c \
+	rrdpush.c rrdpush.h rrdset.c rrdsetvar.c rrdvar.c \
+	simple_pattern.c simple_pattern.h socket.c socket.h \
+	storage_number.c storage_number.h sys_devices_system_edac_mc.c \
+	sys_devices_system_node.c sys_fs_cgroup.c unit_test.c \
+	unit_test.h url.c url.h web_api_old.c web_api_old.h \
+	web_api_v1.c web_api_v1.h web_buffer.c web_buffer.h \
+	web_buffer_svg.c web_buffer_svg.h web_client.c web_client.h \
+	web_server.c web_server.h plugin_freebsd.c plugin_freebsd.h \
 	freebsd_sysctl.c plugin_macos.c plugin_macos.h macos_sysctl.c \
 	macos_mach_smi.c macos_fw.c ipc.c ipc.h plugin_proc.c \
 	plugin_proc.h plugin_proc_diskspace.c plugin_proc_diskspace.h \
@@ -189,13 +161,13 @@ am__netdata_SOURCES_DIST = appconfig.c appconfig.h \
 	proc_net_stat_synproxy.c proc_stat.c \
 	proc_sys_kernel_random_entropy_avail.c proc_vmstat.c \
 	proc_uptime.c sys_kernel_mm_ksm.c
-@FREEBSD_TRUE@am__objects_1 = plugin_freebsd.$(OBJEXT) \
+@FREEBSD_TRUE@am__objects_2 = plugin_freebsd.$(OBJEXT) \
 @FREEBSD_TRUE@	freebsd_sysctl.$(OBJEXT)
-@FREEBSD_FALSE@@MACOS_TRUE@am__objects_2 = plugin_macos.$(OBJEXT) \
+@FREEBSD_FALSE@@MACOS_TRUE@am__objects_3 = plugin_macos.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_TRUE@	macos_sysctl.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_TRUE@	macos_mach_smi.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_TRUE@	macos_fw.$(OBJEXT)
-@FREEBSD_FALSE@@MACOS_FALSE@am__objects_3 = ipc.$(OBJEXT) \
+@FREEBSD_FALSE@@MACOS_FALSE@am__objects_4 = ipc.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_FALSE@	plugin_proc_diskspace.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_FALSE@	proc_diskstats.$(OBJEXT) \
@@ -218,65 +190,48 @@ am__netdata_SOURCES_DIST = appconfig.c appconfig.h \
 @FREEBSD_FALSE@@MACOS_FALSE@	proc_vmstat.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_FALSE@	proc_uptime.$(OBJEXT) \
 @FREEBSD_FALSE@@MACOS_FALSE@	sys_kernel_mm_ksm.$(OBJEXT)
-am_netdata_OBJECTS = appconfig.$(OBJEXT) \
-	adaptive_resortable_list.$(OBJEXT) avl.$(OBJEXT) \
-	backends.$(OBJEXT) clocks.$(OBJEXT) common.$(OBJEXT) \
-	daemon.$(OBJEXT) dictionary.$(OBJEXT) eval.$(OBJEXT) \
-	global_statistics.$(OBJEXT) health.$(OBJEXT) log.$(OBJEXT) \
-	main.$(OBJEXT) plugin_checks.$(OBJEXT) \
-	plugin_idlejitter.$(OBJEXT) plugin_nfacct.$(OBJEXT) \
-	plugin_tc.$(OBJEXT) plugins_d.$(OBJEXT) popen.$(OBJEXT) \
-	socket.$(OBJEXT) simple_pattern.$(OBJEXT) \
-	sys_fs_cgroup.$(OBJEXT) sys_devices_system_edac_mc.$(OBJEXT) \
-	sys_devices_system_node.$(OBJEXT) procfile.$(OBJEXT) \
-	proc_self_mountinfo.$(OBJEXT) registry.$(OBJEXT) \
-	registry_internals.$(OBJEXT) registry_url.$(OBJEXT) \
-	registry_person.$(OBJEXT) registry_machine.$(OBJEXT) \
-	registry_init.$(OBJEXT) registry_db.$(OBJEXT) \
-	registry_log.$(OBJEXT) rrd.$(OBJEXT) rrd2json.$(OBJEXT) \
-	storage_number.$(OBJEXT) unit_test.$(OBJEXT) url.$(OBJEXT) \
-	web_buffer.$(OBJEXT) web_buffer_svg.$(OBJEXT) \
-	web_client.$(OBJEXT) web_server.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2) $(am__objects_3)
+am_netdata_OBJECTS = adaptive_resortable_list.$(OBJEXT) \
+	appconfig.$(OBJEXT) avl.$(OBJEXT) backends.$(OBJEXT) \
+	clocks.$(OBJEXT) common.$(OBJEXT) daemon.$(OBJEXT) \
+	dictionary.$(OBJEXT) eval.$(OBJEXT) \
+	global_statistics.$(OBJEXT) health.$(OBJEXT) \
+	health_config.$(OBJEXT) health_json.$(OBJEXT) \
+	health_log.$(OBJEXT) log.$(OBJEXT) main.$(OBJEXT) \
+	plugin_checks.$(OBJEXT) plugin_idlejitter.$(OBJEXT) \
+	plugin_nfacct.$(OBJEXT) plugin_tc.$(OBJEXT) \
+	plugins_d.$(OBJEXT) popen.$(OBJEXT) \
+	proc_self_mountinfo.$(OBJEXT) procfile.$(OBJEXT) \
+	registry.$(OBJEXT) registry_db.$(OBJEXT) \
+	registry_init.$(OBJEXT) registry_internals.$(OBJEXT) \
+	registry_log.$(OBJEXT) registry_machine.$(OBJEXT) \
+	registry_person.$(OBJEXT) registry_url.$(OBJEXT) rrd.$(OBJEXT) \
+	rrd2json.$(OBJEXT) rrd2json_api_old.$(OBJEXT) \
+	rrdcalc.$(OBJEXT) rrdcalctemplate.$(OBJEXT) rrddim.$(OBJEXT) \
+	rrddimvar.$(OBJEXT) rrdfamily.$(OBJEXT) rrdhost.$(OBJEXT) \
+	rrdpush.$(OBJEXT) rrdset.$(OBJEXT) rrdsetvar.$(OBJEXT) \
+	rrdvar.$(OBJEXT) simple_pattern.$(OBJEXT) socket.$(OBJEXT) \
+	storage_number.$(OBJEXT) sys_devices_system_edac_mc.$(OBJEXT) \
+	sys_devices_system_node.$(OBJEXT) sys_fs_cgroup.$(OBJEXT) \
+	unit_test.$(OBJEXT) url.$(OBJEXT) web_api_old.$(OBJEXT) \
+	web_api_v1.$(OBJEXT) web_buffer.$(OBJEXT) \
+	web_buffer_svg.$(OBJEXT) web_client.$(OBJEXT) \
+	web_server.$(OBJEXT) $(am__objects_2) $(am__objects_3) \
+	$(am__objects_4)
 netdata_OBJECTS = $(am_netdata_OBJECTS)
-am__DEPENDENCIES_1 =
 netdata_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(apps_plugin_SOURCES) $(netdata_SOURCES)
-DIST_SOURCES = $(apps_plugin_SOURCES) $(am__netdata_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
+SOURCES = $(apps_plugin_SOURCES) $(freeipmi_plugin_SOURCES) \
+	$(netdata_SOURCES)
+DIST_SOURCES = $(am__apps_plugin_SOURCES_DIST) \
+	$(freeipmi_plugin_SOURCES) $(am__netdata_SOURCES_DIST)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -306,30 +261,11 @@ am__uninstall_files_from_dir = { \
   }
 DATA = $(dist_cache_DATA) $(dist_log_DATA) $(dist_registry_DATA) \
 	$(dist_varlib_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -353,7 +289,11 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPMIMONITORING_CFLAGS = @IPMIMONITORING_CFLAGS@
+IPMIMONITORING_LIBS = @IPMIMONITORING_LIBS@
 LDFLAGS = @LDFLAGS@
+LIBCAP_CFLAGS = @LIBCAP_CFLAGS@
+LIBCAP_LIBS = @LIBCAP_LIBS@
 LIBMNL_CFLAGS = @LIBMNL_CFLAGS@
 LIBMNL_LIBS = @LIBMNL_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -367,6 +307,10 @@ MKDIR_P = @MKDIR_P@
 NFACCT_CFLAGS = @NFACCT_CFLAGS@
 NFACCT_LIBS = @NFACCT_LIBS@
 OBJEXT = @OBJEXT@
+OPTIONAL_IPMIMONITORING_CFLAGS = @OPTIONAL_IPMIMONITORING_CFLAGS@
+OPTIONAL_IPMIMONITORING_LIBS = @OPTIONAL_IPMIMONITORING_LIBS@
+OPTIONAL_LIBCAP_CFLAGS = @OPTIONAL_LIBCAP_CFLAGS@
+OPTIONAL_LIBCAP_LIBS = @OPTIONAL_LIBCAP_LIBS@
 OPTIONAL_MATH_CLFAGS = @OPTIONAL_MATH_CLFAGS@
 OPTIONAL_MATH_LIBS = @OPTIONAL_MATH_LIBS@
 OPTIONAL_NFACCT_CLFAGS = @OPTIONAL_NFACCT_CLFAGS@
@@ -483,33 +427,40 @@ AM_CFLAGS = \
 	$(OPTIONAL_NFACCT_CLFAGS) \
 	$(OPTIONAL_ZLIB_CFLAGS) \
 	$(OPTIONAL_UUID_CFLAGS) \
+	$(OPTIONAL_LIBCAP_CFLAGS) \
+	$(OPTIONAL_IPMIMONITORING_CFLAGS)\
 	$(NULL)
 
 dist_cache_DATA = .keep
 dist_varlib_DATA = .keep
 dist_registry_DATA = .keep
 dist_log_DATA = .keep
-netdata_SOURCES = appconfig.c appconfig.h adaptive_resortable_list.c \
-	adaptive_resortable_list.h avl.c avl.h backends.c backends.h \
-	clocks.c clocks.h common.c common.h daemon.c daemon.h \
-	dictionary.c dictionary.h eval.c eval.h global_statistics.c \
-	global_statistics.h health.c health.h inlined.h log.c log.h \
-	main.c main.h plugin_checks.c plugin_checks.h \
+netdata_SOURCES = adaptive_resortable_list.c \
+	adaptive_resortable_list.h appconfig.c appconfig.h avl.c avl.h \
+	backends.c backends.h clocks.c clocks.h common.c common.h \
+	daemon.c daemon.h dictionary.c dictionary.h eval.c eval.h \
+	global_statistics.c global_statistics.h health.c health.h \
+	health_config.c health_json.c health_log.c inlined.h locks.h \
+	log.c log.h main.c main.h plugin_checks.c plugin_checks.h \
 	plugin_idlejitter.c plugin_idlejitter.h plugin_nfacct.c \
 	plugin_nfacct.h plugin_tc.c plugin_tc.h plugins_d.c \
-	plugins_d.h popen.c popen.h socket.c socket.h simple_pattern.c \
-	simple_pattern.h sys_fs_cgroup.c sys_devices_system_edac_mc.c \
-	sys_devices_system_node.c procfile.c procfile.h \
-	proc_self_mountinfo.c proc_self_mountinfo.h registry.c \
-	registry.h registry_internals.c registry_internals.h \
-	registry_url.c registry_url.h registry_person.c \
-	registry_person.h registry_machine.c registry_machine.h \
-	registry_init.c registry_db.c registry_log.c rrd.c rrd.h \
-	rrd2json.c rrd2json.h storage_number.c storage_number.h \
-	unit_test.c unit_test.h url.c url.h web_buffer.c web_buffer.h \
+	plugins_d.h popen.c popen.h proc_self_mountinfo.c \
+	proc_self_mountinfo.h procfile.c procfile.h registry.c \
+	registry.h registry_db.c registry_init.c registry_internals.c \
+	registry_internals.h registry_log.c registry_machine.c \
+	registry_machine.h registry_person.c registry_person.h \
+	registry_url.c registry_url.h rrd.c rrd.h rrd2json.c \
+	rrd2json.h rrd2json_api_old.c rrd2json_api_old.h rrdcalc.c \
+	rrdcalctemplate.c rrddim.c rrddimvar.c rrdfamily.c rrdhost.c \
+	rrdpush.c rrdpush.h rrdset.c rrdsetvar.c rrdvar.c \
+	simple_pattern.c simple_pattern.h socket.c socket.h \
+	storage_number.c storage_number.h sys_devices_system_edac_mc.c \
+	sys_devices_system_node.c sys_fs_cgroup.c unit_test.c \
+	unit_test.h url.c url.h web_api_old.c web_api_old.h \
+	web_api_v1.c web_api_v1.h web_buffer.c web_buffer.h \
 	web_buffer_svg.c web_buffer_svg.h web_client.c web_client.h \
-	web_server.c web_server.h $(NULL) $(am__append_1) \
-	$(am__append_2) $(am__append_3)
+	web_server.c web_server.h $(NULL) $(am__append_3) \
+	$(am__append_4) $(am__append_5)
 netdata_LDADD = \
 	$(OPTIONAL_MATH_LIBS) \
 	$(OPTIONAL_NFACCT_LIBS) \
@@ -517,15 +468,25 @@ netdata_LDADD = \
 	$(OPTIONAL_UUID_LIBS) \
 	$(NULL)
 
-apps_plugin_SOURCES = \
-	apps_plugin.c \
-	avl.c avl.h \
+apps_plugin_SOURCES = apps_plugin.c avl.c avl.h clocks.c clocks.h \
+	common.c common.h inlined.h log.c log.h procfile.c procfile.h \
+	web_buffer.c web_buffer.h $(NULL) $(am__append_6)
+apps_plugin_LDADD = \
+	$(OPTIONAL_MATH_LIBS) \
+	$(OPTIONAL_LIBCAP_LIBS) \
+	$(NULL)
+
+freeipmi_plugin_SOURCES = \
+	freeipmi_plugin.c \
 	clocks.c clocks.h \
 	common.c common.h \
 	inlined.h \
 	log.c log.h \
 	procfile.c procfile.h \
-	web_buffer.c web_buffer.h \
+	$(NULL)
+
+freeipmi_plugin_LDADD = \
+	$(OPTIONAL_IPMIMONITORING_LIBS) \
 	$(NULL)
 
 all: all-am
@@ -544,6 +505,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -563,18 +525,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-pluginsPROGRAMS: $(plugins_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(pluginsdir)" || $(MKDIR_P) "$(DESTDIR)$(pluginsdir)"
 	@list='$(plugins_PROGRAMS)'; test -n "$(pluginsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pluginsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pluginsdir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -595,8 +553,7 @@ uninstall-pluginsPROGRAMS:
 	@list='$(plugins_PROGRAMS)'; test -n "$(pluginsdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
+	      -e 's/$$/$(EXEEXT)/' `; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(pluginsdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(pluginsdir)" && rm -f $$files
@@ -605,18 +562,14 @@ clean-pluginsPROGRAMS:
 	-test -z "$(plugins_PROGRAMS)" || rm -f $(plugins_PROGRAMS)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
-	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -637,22 +590,22 @@ uninstall-sbinPROGRAMS:
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
+	      -e 's/$$/$(EXEEXT)/' `; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
 
 clean-sbinPROGRAMS:
 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
-
 apps.plugin$(EXEEXT): $(apps_plugin_OBJECTS) $(apps_plugin_DEPENDENCIES) $(EXTRA_apps_plugin_DEPENDENCIES) 
 	@rm -f apps.plugin$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(apps_plugin_OBJECTS) $(apps_plugin_LDADD) $(LIBS)
-
+	$(LINK) $(apps_plugin_OBJECTS) $(apps_plugin_LDADD) $(LIBS)
+freeipmi.plugin$(EXEEXT): $(freeipmi_plugin_OBJECTS) $(freeipmi_plugin_DEPENDENCIES) $(EXTRA_freeipmi_plugin_DEPENDENCIES) 
+	@rm -f freeipmi.plugin$(EXEEXT)
+	$(LINK) $(freeipmi_plugin_OBJECTS) $(freeipmi_plugin_LDADD) $(LIBS)
 netdata$(EXEEXT): $(netdata_OBJECTS) $(netdata_DEPENDENCIES) $(EXTRA_netdata_DEPENDENCIES) 
 	@rm -f netdata$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(netdata_OBJECTS) $(netdata_LDADD) $(LIBS)
+	$(LINK) $(netdata_OBJECTS) $(netdata_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -671,8 +624,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dictionary.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freebsd_sysctl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freeipmi_plugin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global_statistics.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/health.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/health_config.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/health_json.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/health_log.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/macos_fw.Po@am__quote@
@@ -720,6 +677,17 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/registry_url.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrd2json.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrd2json_api_old.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdcalc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdcalctemplate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrddim.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrddimvar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdfamily.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdhost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdpush.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdset.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdsetvar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrdvar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_pattern.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/storage_number.Po@am__quote@
@@ -729,31 +697,30 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys_kernel_mm_ksm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_api_old.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_api_v1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_buffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_buffer_svg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_server.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 install-dist_cacheDATA: $(dist_cache_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(cachedir)" || $(MKDIR_P) "$(DESTDIR)$(cachedir)"
 	@list='$(dist_cache_DATA)'; test -n "$(cachedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(cachedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(cachedir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -770,11 +737,8 @@ uninstall-dist_cacheDATA:
 	dir='$(DESTDIR)$(cachedir)'; $(am__uninstall_files_from_dir)
 install-dist_logDATA: $(dist_log_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(logdir)" || $(MKDIR_P) "$(DESTDIR)$(logdir)"
 	@list='$(dist_log_DATA)'; test -n "$(logdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(logdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(logdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -791,11 +755,8 @@ uninstall-dist_logDATA:
 	dir='$(DESTDIR)$(logdir)'; $(am__uninstall_files_from_dir)
 install-dist_registryDATA: $(dist_registry_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(registrydir)" || $(MKDIR_P) "$(DESTDIR)$(registrydir)"
 	@list='$(dist_registry_DATA)'; test -n "$(registrydir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(registrydir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(registrydir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -812,11 +773,8 @@ uninstall-dist_registryDATA:
 	dir='$(DESTDIR)$(registrydir)'; $(am__uninstall_files_from_dir)
 install-dist_varlibDATA: $(dist_varlib_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(varlibdir)" || $(MKDIR_P) "$(DESTDIR)$(varlibdir)"
 	@list='$(dist_varlib_DATA)'; test -n "$(varlibdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(varlibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(varlibdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -832,15 +790,26 @@ uninstall-dist_varlibDATA:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(varlibdir)'; $(am__uninstall_files_from_dir)
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -852,11 +821,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -865,21 +838,6 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -978,8 +936,7 @@ info-am:
 install-data-am: install-dist_cacheDATA install-dist_logDATA \
 	install-dist_registryDATA install-dist_varlibDATA \
 	install-pluginsPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
 install-dvi: install-dvi-am
 
 install-dvi-am:
@@ -1027,45 +984,26 @@ uninstall-am: uninstall-dist_cacheDATA uninstall-dist_logDATA \
 	uninstall-dist_registryDATA uninstall-dist_varlibDATA \
 	uninstall-pluginsPROGRAMS uninstall-sbinPROGRAMS
 
-.MAKE: install-am install-data-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-pluginsPROGRAMS clean-sbinPROGRAMS cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-hook install-dist_cacheDATA install-dist_logDATA \
-	install-dist_registryDATA install-dist_varlibDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginsPROGRAMS install-ps \
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-pluginsPROGRAMS clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_cacheDATA \
+	install-dist_logDATA install-dist_registryDATA \
+	install-dist_varlibDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pluginsPROGRAMS install-ps \
 	install-ps-am install-sbinPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-dist_cacheDATA uninstall-dist_logDATA \
 	uninstall-dist_registryDATA uninstall-dist_varlibDATA \
 	uninstall-pluginsPROGRAMS uninstall-sbinPROGRAMS
 
-.PRECIOUS: Makefile
-
-
-install-data-hook:
-	if [ `id -u` == 0 ]; then \
-		chown root '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
-		chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
-		( setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin' || \
-		  chmod 4755 '$(DESTDIR)$(pluginsdir)/apps.plugin' ); \
-	else \
-		echo; \
-		echo "ATTENTION"; \
-		echo; \
-		echo "$(pluginsdir)/apps.plugin requires escalated capabilities:"; \
-		echo "sudo chown root '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
-		echo "sudo chmod 0755 '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
-		echo "sudo setcap cap_dac_read_search,cap_sys_ptrace+ep '$(DESTDIR)$(pluginsdir)/apps.plugin'"; \
-		echo; \
-	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.