New upstream version 1.6.0+dfsgupstream/1.6.0+dfsg

1 files changed, 42 insertions, 132 deletions

diff --git a/web/Makefile.in b/web/Makefile.in
index e09392e9e..9ec69e6aa 100644
--- a/web/Makefile.in
+++ b/web/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.
@@ -15,61 +16,6 @@
 @SET_MAKE@
 
 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@
@@ -89,9 +35,14 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = web
+DIST_COMMON = $(dist_web_DATA) $(dist_webcss_DATA) $(dist_webdnt_DATA) \
+	$(dist_webfonts_DATA) $(dist_webimages_DATA) \
+	$(dist_weblib_DATA) $(dist_webold_DATA) \
+	$(dist_webwellknown_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 \
@@ -100,33 +51,12 @@ 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_web_DATA) \
-	$(dist_webcss_DATA) $(dist_webdnt_DATA) $(dist_webfonts_DATA) \
-	$(dist_webimages_DATA) $(dist_weblib_DATA) $(dist_webold_DATA) \
-	$(dist_webwellknown_DATA) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-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 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -162,12 +92,9 @@ DATA = $(dist_web_DATA) $(dist_webcss_DATA) $(dist_webdnt_DATA) \
 	$(dist_webfonts_DATA) $(dist_webimages_DATA) \
 	$(dist_weblib_DATA) $(dist_webold_DATA) \
 	$(dist_webwellknown_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -191,7 +118,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@
@@ -205,6 +136,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@
@@ -314,6 +249,7 @@ dist_web_DATA = \
 	dashboard.html \
 	dashboard.js \
 	dashboard_info.js \
+	dashboard_info_custom_example.js \
 	dashboard.css \
 	dashboard.slate.css \
 	favicon.ico \
@@ -347,7 +283,7 @@ dist_weblib_DATA = \
 	lib/d3-3.5.17.min.js \
 	lib/dygraph-combined-dd74404.js \
 	lib/dygraph-smooth-plotter-dd74404.js \
-	lib/gauge-d5260c3.min.js \
+	lib/gauge-1.3.2.min.js \
 	lib/jquery-2.2.4.min.js \
 	lib/jquery.easypiechart-97b5824.min.js \
 	lib/perfect-scrollbar-0.6.15.min.js \
@@ -432,6 +368,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu web/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu web/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -451,11 +388,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-dist_webDATA: $(dist_web_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(webdir)" || $(MKDIR_P) "$(DESTDIR)$(webdir)"
 	@list='$(dist_web_DATA)'; test -n "$(webdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(webdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(webdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -472,11 +406,8 @@ uninstall-dist_webDATA:
 	dir='$(DESTDIR)$(webdir)'; $(am__uninstall_files_from_dir)
 install-dist_webcssDATA: $(dist_webcss_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(webcssdir)" || $(MKDIR_P) "$(DESTDIR)$(webcssdir)"
 	@list='$(dist_webcss_DATA)'; test -n "$(webcssdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(webcssdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(webcssdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -493,11 +424,8 @@ uninstall-dist_webcssDATA:
 	dir='$(DESTDIR)$(webcssdir)'; $(am__uninstall_files_from_dir)
 install-dist_webdntDATA: $(dist_webdnt_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(webdntdir)" || $(MKDIR_P) "$(DESTDIR)$(webdntdir)"
 	@list='$(dist_webdnt_DATA)'; test -n "$(webdntdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(webdntdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(webdntdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -514,11 +442,8 @@ uninstall-dist_webdntDATA:
 	dir='$(DESTDIR)$(webdntdir)'; $(am__uninstall_files_from_dir)
 install-dist_webfontsDATA: $(dist_webfonts_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(webfontsdir)" || $(MKDIR_P) "$(DESTDIR)$(webfontsdir)"
 	@list='$(dist_webfonts_DATA)'; test -n "$(webfontsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(webfontsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(webfontsdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -535,11 +460,8 @@ uninstall-dist_webfontsDATA:
 	dir='$(DESTDIR)$(webfontsdir)'; $(am__uninstall_files_from_dir)
 install-dist_webimagesDATA: $(dist_webimages_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(webimagesdir)" || $(MKDIR_P) "$(DESTDIR)$(webimagesdir)"
 	@list='$(dist_webimages_DATA)'; test -n "$(webimagesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(webimagesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(webimagesdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -556,11 +478,8 @@ uninstall-dist_webimagesDATA:
 	dir='$(DESTDIR)$(webimagesdir)'; $(am__uninstall_files_from_dir)
 install-dist_weblibDATA: $(dist_weblib_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(weblibdir)" || $(MKDIR_P) "$(DESTDIR)$(weblibdir)"
 	@list='$(dist_weblib_DATA)'; test -n "$(weblibdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(weblibdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(weblibdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -577,11 +496,8 @@ uninstall-dist_weblibDATA:
 	dir='$(DESTDIR)$(weblibdir)'; $(am__uninstall_files_from_dir)
 install-dist_weboldDATA: $(dist_webold_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(webolddir)" || $(MKDIR_P) "$(DESTDIR)$(webolddir)"
 	@list='$(dist_webold_DATA)'; test -n "$(webolddir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(webolddir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(webolddir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -598,11 +514,8 @@ uninstall-dist_weboldDATA:
 	dir='$(DESTDIR)$(webolddir)'; $(am__uninstall_files_from_dir)
 install-dist_webwellknownDATA: $(dist_webwellknown_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(webwellknowndir)" || $(MKDIR_P) "$(DESTDIR)$(webwellknowndir)"
 	@list='$(dist_webwellknown_DATA)'; test -n "$(webwellknowndir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(webwellknowndir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(webwellknowndir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -617,11 +530,11 @@ uninstall-dist_webwellknownDATA:
 	@list='$(dist_webwellknown_DATA)'; test -n "$(webwellknowndir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(webwellknowndir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
+tags: TAGS
+TAGS:
 
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
 distdir: $(DISTFILES)
@@ -766,10 +679,10 @@ uninstall-am: uninstall-dist_webDATA uninstall-dist_webcssDATA \
 
 .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_webDATA install-dist_webcssDATA \
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_webDATA install-dist_webcssDATA \
 	install-dist_webdntDATA install-dist_webfontsDATA \
 	install-dist_webimagesDATA install-dist_weblibDATA \
 	install-dist_weboldDATA install-dist_webwellknownDATA \
@@ -778,14 +691,11 @@ uninstall-am: uninstall-dist_webDATA uninstall-dist_webcssDATA \
 	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_webDATA \
-	uninstall-dist_webcssDATA uninstall-dist_webdntDATA \
-	uninstall-dist_webfontsDATA uninstall-dist_webimagesDATA \
-	uninstall-dist_weblibDATA uninstall-dist_weboldDATA \
-	uninstall-dist_webwellknownDATA
-
-.PRECIOUS: Makefile
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-dist_webDATA uninstall-dist_webcssDATA \
+	uninstall-dist_webdntDATA uninstall-dist_webfontsDATA \
+	uninstall-dist_webimagesDATA uninstall-dist_weblibDATA \
+	uninstall-dist_weboldDATA uninstall-dist_webwellknownDATA
 
 
 version.txt: