summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-12-28 14:42:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-12-28 14:42:52 +0000
commit12b9efaebb6d008437af4a72a98d05c4319fc825 (patch)
tree70876046e52ae898dd7327424f2c27fde1a5d45f /Makefile.am
parentReleasing debian version 1.11.0+dfsg-1~exp1. (diff)
downloadnetdata-12b9efaebb6d008437af4a72a98d05c4319fc825.tar.xz
netdata-12b9efaebb6d008437af4a72a98d05c4319fc825.zip
Merging upstream version 1.11.1+dfsg
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am26
1 files changed, 25 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index c7fa48c6..c90db5ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-AUTOMAKE_OPTIONS=foreign subdir-objects 1.10
+AUTOMAKE_OPTIONS=foreign subdir-objects 1.11
ACLOCAL_AMFLAGS = -I build/m4
MAINTAINERCLEANFILES= \
@@ -44,6 +44,7 @@ EXTRA_DIST = \
CODE_OF_CONDUCT.md \
LICENSE \
REDISTRIBUTED.md \
+ CONTRIBUTING.md \
$(NULL)
SUBDIRS = \
@@ -61,6 +62,27 @@ dist_noinst_DATA= \
netdata.cppcheck \
netdata.spec \
package.json \
+ doc/Add-more-charts-to-netdata.md \
+ doc/Demo-Sites.md \
+ doc/Donations-netdata-has-received.md \
+ doc/Netdata-Security-and-Disclosure-Information.md \
+ doc/Performance.md \
+ doc/Running-behind-apache.md \
+ doc/Running-behind-caddy.md \
+ doc/Running-behind-lighttpd.md \
+ doc/Running-behind-nginx.md \
+ doc/Third-Party-Plugins.md \
+ doc/a-github-star-is-important.md \
+ doc/high-performance-netdata.md \
+ doc/netdata-for-IoT.md \
+ doc/netdata-security.md \
+ doc/Why-Netdata.md \
+ htmldoc/themes/material/partials/footer.html \
+ installer/README.md \
+ installer/UNINSTALL.md \
+ installer/UPDATE.md \
+ requirements.txt \
+ runtime.txt \
$(NULL)
# until integrated within build
@@ -71,6 +93,8 @@ dist_noinst_SCRIPTS= \
kickstart-static64.sh \
netdata-installer.sh \
installer/functions.sh \
+ htmldoc/buildhtml.sh \
+ htmldoc/buildyaml.sh \
$(NULL)
# -----------------------------------------------------------------------------