New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 61 insertions, 88 deletions

diff --git a/node.d/Makefile.in b/collectors/statsd.plugin/Makefile.in
index dd572ee8b..5c16a86d1 100644
--- a/node.d/Makefile.in
+++ b/collectors/statsd.plugin/Makefile.in
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -78,19 +80,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = node.d
+subdir = collectors/statsd.plugin
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_node_DATA) $(dist_nodemodules_DATA) \
-	$(dist_nodemoduleslibber_DATA)
+	$(dist_noinst_DATA) $(dist_statsdconfig_DATA) \
+	$(dist_userstatsdconfig_DATA)
 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_lto.m4 \
-	$(top_srcdir)/m4/ax_c_mallinfo.m4 \
-	$(top_srcdir)/m4/ax_c_mallopt.m4 \
-	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/jemalloc.m4 \
-	$(top_srcdir)/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/ax_c___atomic.m4 \
+	$(top_srcdir)/build/m4/ax_c__generic.m4 \
+	$(top_srcdir)/build/m4/ax_c_lto.m4 \
+	$(top_srcdir)/build/m4/ax_c_mallinfo.m4 \
+	$(top_srcdir)/build/m4/ax_c_mallopt.m4 \
+	$(top_srcdir)/build/m4/ax_check_compile_flag.m4 \
+	$(top_srcdir)/build/m4/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/build/m4/ax_pthread.m4 \
+	$(top_srcdir)/build/m4/jemalloc.m4 \
+	$(top_srcdir)/build/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -143,10 +147,10 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(nodedir)" "$(DESTDIR)$(nodemodulesdir)" \
-	"$(DESTDIR)$(nodemoduleslibberdir)"
-DATA = $(dist_node_DATA) $(dist_nodemodules_DATA) \
-	$(dist_nodemoduleslibber_DATA)
+am__installdirs = "$(DESTDIR)$(statsdconfigdir)" \
+	"$(DESTDIR)$(userstatsdconfigdir)"
+DATA = $(dist_noinst_DATA) $(dist_statsdconfig_DATA) \
+	$(dist_userstatsdconfig_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -246,6 +250,7 @@ build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
+build_target = @build_target@
 build_vendor = @build_vendor@
 builddir = @builddir@
 cachedir = @cachedir@
@@ -267,6 +272,7 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+libconfigdir = @libconfigdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -293,33 +299,22 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 varlibdir = @varlibdir@
 webdir = @webdir@
+AUTOMAKE_OPTIONS = subdir-objects
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-dist_node_DATA = \
+dist_noinst_DATA = \
 	README.md \
-	named.node.js \
-	fronius.node.js \
-	sma_webbox.node.js \
-	snmp.node.js \
-	stiebeleltron.node.js \
 	$(NULL)
 
-nodemodulesdir = $(nodedir)/node_modules
-dist_nodemodules_DATA = \
-	node_modules/netdata.js \
-	node_modules/extend.js \
-	node_modules/pixl-xml.js \
-	node_modules/net-snmp.js \
-	node_modules/asn1-ber.js \
-	$(NULL)
+statsdconfigdir = $(libconfigdir)/statsd.d
+dist_statsdconfig_DATA = \
+    $(top_srcdir)/installer/.keep \
+    example.conf \
+    $(NULL)
 
-nodemoduleslibberdir = $(nodedir)/node_modules/lib/ber
-dist_nodemoduleslibber_DATA = \
-	node_modules/lib/ber/index.js \
-	node_modules/lib/ber/errors.js \
-	node_modules/lib/ber/reader.js \
-	node_modules/lib/ber/types.js \
-	node_modules/lib/ber/writer.js \
-	$(NULL)
+userstatsdconfigdir = $(configdir)/statsd.d
+dist_userstatsdconfig_DATA = \
+    $(top_srcdir)/installer/.keep \
+    $(NULL)
 
 all: all-am
 
@@ -333,9 +328,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu node.d/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu collectors/statsd.plugin/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu node.d/Makefile
+	  $(AUTOMAKE) --gnu collectors/statsd.plugin/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -354,69 +349,48 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-dist_nodeDATA: $(dist_node_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_node_DATA)'; test -n "$(nodedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(nodedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(nodedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nodedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(nodedir)" || exit $$?; \
-	done
-
-uninstall-dist_nodeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_node_DATA)'; test -n "$(nodedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(nodedir)'; $(am__uninstall_files_from_dir)
-install-dist_nodemodulesDATA: $(dist_nodemodules_DATA)
+install-dist_statsdconfigDATA: $(dist_statsdconfig_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_nodemodules_DATA)'; test -n "$(nodemodulesdir)" || list=; \
+	@list='$(dist_statsdconfig_DATA)'; test -n "$(statsdconfigdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(nodemodulesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(nodemodulesdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(statsdconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(statsdconfigdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nodemodulesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(nodemodulesdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(statsdconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(statsdconfigdir)" || exit $$?; \
 	done
 
-uninstall-dist_nodemodulesDATA:
+uninstall-dist_statsdconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_nodemodules_DATA)'; test -n "$(nodemodulesdir)" || list=; \
+	@list='$(dist_statsdconfig_DATA)'; test -n "$(statsdconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(nodemodulesdir)'; $(am__uninstall_files_from_dir)
-install-dist_nodemoduleslibberDATA: $(dist_nodemoduleslibber_DATA)
+	dir='$(DESTDIR)$(statsdconfigdir)'; $(am__uninstall_files_from_dir)
+install-dist_userstatsdconfigDATA: $(dist_userstatsdconfig_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_nodemoduleslibber_DATA)'; test -n "$(nodemoduleslibberdir)" || list=; \
+	@list='$(dist_userstatsdconfig_DATA)'; test -n "$(userstatsdconfigdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(nodemoduleslibberdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(nodemoduleslibberdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(userstatsdconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(userstatsdconfigdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nodemoduleslibberdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(nodemoduleslibberdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(userstatsdconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(userstatsdconfigdir)" || exit $$?; \
 	done
 
-uninstall-dist_nodemoduleslibberDATA:
+uninstall-dist_userstatsdconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_nodemoduleslibber_DATA)'; test -n "$(nodemoduleslibberdir)" || list=; \
+	@list='$(dist_userstatsdconfig_DATA)'; test -n "$(userstatsdconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(nodemoduleslibberdir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(userstatsdconfigdir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
@@ -458,7 +432,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(nodedir)" "$(DESTDIR)$(nodemodulesdir)" "$(DESTDIR)$(nodemoduleslibberdir)"; do \
+	for dir in "$(DESTDIR)$(statsdconfigdir)" "$(DESTDIR)$(userstatsdconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -512,8 +486,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_nodeDATA install-dist_nodemodulesDATA \
-	install-dist_nodemoduleslibberDATA
+install-data-am: install-dist_statsdconfigDATA \
+	install-dist_userstatsdconfigDATA
 
 install-dvi: install-dvi-am
 
@@ -557,25 +531,24 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_nodeDATA uninstall-dist_nodemodulesDATA \
-	uninstall-dist_nodemoduleslibberDATA
+uninstall-am: uninstall-dist_statsdconfigDATA \
+	uninstall-dist_userstatsdconfigDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
 	ctags-am distclean distclean-generic distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dist_nodeDATA \
-	install-dist_nodemodulesDATA \
-	install-dist_nodemoduleslibberDATA install-dvi install-dvi-am \
+	install-data-am install-dist_statsdconfigDATA \
+	install-dist_userstatsdconfigDATA 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-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags-am uninstall uninstall-am \
-	uninstall-dist_nodeDATA uninstall-dist_nodemodulesDATA \
-	uninstall-dist_nodemoduleslibberDATA
+	uninstall-dist_statsdconfigDATA \
+	uninstall-dist_userstatsdconfigDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.