From 87649cf32bd0e14d5a903fb85b01e9f41a253540 Mon Sep 17 00:00:00 2001
From: Federico Ceratto <federico.ceratto@gmail.com>
Date: Wed, 23 Nov 2016 15:49:10 +0000
Subject: New upstream version 1.4.0+dfsg

---
 web/Makefile.in | 63 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 23 deletions(-)

(limited to 'web/Makefile.in')

diff --git a/web/Makefile.in b/web/Makefile.in
index 6e5e46a91..d908f472f 100644
--- a/web/Makefile.in
+++ b/web/Makefile.in
@@ -85,8 +85,13 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(dist_weblib_DATA) $(dist_webold_DATA) \
 	$(dist_webwellknown_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_c___atomic.m4 \
+	$(top_srcdir)/m4/ax_c__generic.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_pthread.m4 $(top_srcdir)/m4/jemalloc.m4 \
+	$(top_srcdir)/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -215,6 +220,7 @@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SSE_CANDIDATE = @SSE_CANDIDATE@
 STRIP = @STRIP@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
@@ -247,6 +253,8 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+has_jemalloc = @has_jemalloc@
+has_tcmalloc = @has_tcmalloc@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -293,9 +301,11 @@ dist_web_DATA = \
 	demosites.html \
 	dashboard.html \
 	dashboard.js \
+	dashboard_info.js \
 	dashboard.css \
 	dashboard.slate.css \
 	favicon.ico \
+	goto-host-from-alarm.html \
 	index.html \
 	netdata-swagger.yaml \
 	netdata-swagger.json \
@@ -316,33 +326,34 @@ dist_webold_DATA = \
 
 weblibdir = $(webdir)/lib
 dist_weblib_DATA = \
-	lib/dygraph-combined.js \
-	lib/dygraph-smooth-plotter.js \
-	lib/jquery-1.12.0.min.js \
-	lib/jquery.peity.min.js \
-	lib/jquery.sparkline.min.js \
-	lib/morris.min.js \
-	lib/raphael-min.js \
-	lib/jquery.easypiechart.min.js \
-	lib/jquery.nanoscroller.min.js \
-	lib/bootstrap.min.js \
-	lib/ElementQueries.js \
-	lib/ResizeSensor.js \
-	lib/bootstrap-toggle.min.js \
-	lib/c3.min.js \
-	lib/d3.min.js \
-	lib/gauge.min.js \
+	lib/bootstrap-3.3.7.min.js \
+	lib/bootstrap-table-1.11.0.min.js \
+	lib/bootstrap-table-export-1.11.0.min.js \
+	lib/bootstrap-toggle-2.2.2.min.js \
+	lib/c3-0.4.11.min.js \
+	lib/d3-3.5.17.min.js \
+	lib/dygraph-combined-dd74404.js \
+	lib/dygraph-smooth-plotter-dd74404.js \
+	lib/gauge-d5260c3.min.js \
+	lib/jquery-2.2.4.min.js \
+	lib/jquery.easypiechart-97b5824.min.js \
+	lib/jquery.nanoscroller-0.8.7.min.js \
+	lib/jquery.peity-3.2.0.min.js \
+	lib/jquery.sparkline-2.1.2.min.js \
+	lib/morris-0.5.1.min.js \
+	lib/raphael-2.2.4-min.js \
+	lib/tableExport-1.6.0.min.js \
 	$(NULL)
 
 webcssdir = $(webdir)/css
 dist_webcss_DATA = \
-	css/morris.css \
-	css/bootstrap.min.css \
-	css/bootstrap-theme.min.css \
+	css/morris-0.5.1.css \
+	css/bootstrap-3.3.7.min.css \
+	css/bootstrap-theme-3.3.7.min.css \
 	css/bootstrap.slate.min.css \
+	css/bootstrap-toggle-2.2.2.min.css \
 	css/font-awesome.min.css \
-	css/bootstrap-toggle.min.css \
-	css/c3.min.css \
+	css/c3-0.4.11.min.css \
 	$(NULL)
 
 webfontsdir = $(webdir)/fonts
@@ -362,7 +373,13 @@ dist_webfonts_DATA = \
 
 webimagesdir = $(webdir)/images
 dist_webimages_DATA = \
+	images/alert-128-orange.png \
+	images/alert-128-red.png \
+	images/alert-multi-size-orange.ico \
+	images/alert-multi-size-red.ico \
 	images/animated.gif \
+	images/check-mark-2-128-green.png \
+	images/check-mark-2-multi-size-green.ico \
 	images/post.png \
 	images/seo-performance-16.png \
 	images/seo-performance-24.png \
-- 
cgit v1.2.3