makefiles re-organization

6 files changed, 53 insertions, 25 deletions

diff --git a/.gitignore b/.gitignore
index 00c7d6d68f..194b171de3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,5 @@ diagrams/*.atxt
 diagrams/plantuml.jar
 
 netdata.cppcheck
+
+profile/statsd-stress
diff --git a/Makefile.am b/Makefile.am
index 7d5bc57f8e..6f04cd8c90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ MAINTAINERCLEANFILES= \
 
 EXTRA_DIST = \
 	.gitignore \
+	.codacy.yml \
 	.codeclimate.yml \
 	.csslintrc \
 	.eslintignore \
@@ -42,7 +43,6 @@ EXTRA_DIST = \
 	LICENSE-REDISTRIBUTED.md \
 	COPYING \
 	autogen.sh \
-	tests/stress.sh \
 	$(NULL)
 
 SUBDIRS = \
@@ -55,14 +55,10 @@ SUBDIRS = \
 	system \
 	web \
 	contrib \
+	tests \
 	$(NULL)
 
 dist_noinst_DATA= \
-	diagrams/config.puml \
-	diagrams/registry.puml \
-	diagrams/netdata-for-ephemeral-nodes.xml \
-	diagrams/netdata-proxies-example.xml \
-	diagrams/netdata-overview.xml \
 	configs.signatures \
 	Dockerfile \
 	netdata.spec \
@@ -71,29 +67,10 @@ dist_noinst_DATA= \
 # until integrated within build
 # should be proper init.d/openrc/systemd usable
 dist_noinst_SCRIPTS= \
-	diagrams/build.sh \
 	coverity-scan.sh \
 	docker-build.sh \
 	kickstart.sh \
 	kickstart-static64.sh \
 	netdata-installer.sh \
 	installer/functions.sh \
-	makeself/build.sh \
-	makeself/makeself.sh \
-	makeself/makeself-license.txt \
-	makeself/setup-x86_64-static.sh \
-	makeself/post-installer.sh \
-	makeself/jobs/10-prepare-destination.install.sh \
-	makeself/jobs/50-curl-7.53.1.install.sh \
-	makeself/jobs/50-bash-4.4.install.sh \
-	makeself/jobs/50-fping-4.0.install.sh \
-	makeself/jobs/70-netdata-git.install.sh \
-	makeself/jobs/99-makeself.install.sh \
-	makeself/run-all-jobs.sh \
-	makeself/install-or-update.sh \
-	makeself/build-x86_64-static.sh \
-	makeself/makeself-header.sh \
-	makeself/makeself-help-header.txt \
-	makeself/makeself.lsm \
-	makeself/functions.sh \
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index a0062d3ff0..ce534e0ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -492,7 +492,10 @@ AC_CONFIG_FILES([
     src/Makefile
     system/Makefile
     web/Makefile
+    diagrams/Makefile
+    makeself/Makefile
     contrib/Makefile
+    tests/Makefile
 ])
 AC_OUTPUT
 
diff --git a/diagrams/Makefile.am b/diagrams/Makefile.am
new file mode 100644
index 0000000000..8c559586a7
--- /dev/null
+++ b/diagrams/Makefile.am
@@ -0,0 +1,13 @@
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+nodist_noinst_DATA = \
+	config.puml \
+	registry.puml \
+	netdata-for-ephemeral-nodes.xml \
+	netdata-proxies-example.xml \
+	netdata-overview.xml \
+    $(NULL)
+
+nodist_noinst_SCRIPTS = \
+	build.sh \
+    $(NULL)
diff --git a/makeself/Makefile.am b/makeself/Makefile.am
new file mode 100644
index 0000000000..d3106f7628
--- /dev/null
+++ b/makeself/Makefile.am
@@ -0,0 +1,25 @@
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+nodist_noinst_DATA = \
+    $(NULL)
+
+nodist_noinst_SCRIPTS = \
+	build.sh \
+	makeself.sh \
+	makeself-license.txt \
+	setup-x86_64-static.sh \
+	post-installer.sh \
+	jobs/10-prepare-destination.install.sh \
+	jobs/50-curl-7.53.1.install.sh \
+	jobs/50-bash-4.4.install.sh \
+	jobs/50-fping-4.0.install.sh \
+	jobs/70-netdata-git.install.sh \
+	jobs/99-makeself.install.sh \
+	run-all-jobs.sh \
+	install-or-update.sh \
+	build-x86_64-static.sh \
+	makeself-header.sh \
+	makeself-help-header.txt \
+	makeself.lsm \
+	functions.sh \
+    $(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000000..4f653f71ab
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,8 @@
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+nodist_noinst_DATA = \
+    $(NULL)
+
+nodist_noinst_SCRIPTS = \
+	stress.sh \
+    $(NULL)