From f9b6042441255939cd9a222fb22a739323df5f88 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 17 Oct 2016 14:36:16 +0200
Subject: [PATCH] build: merge "tools/Makefile.am" into toplevel Makefile

---
 Makefile.am       | 9 ++++++++-
 configure.ac      | 1 -
 tools/Makefile.am | 8 --------
 3 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 tools/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95eb31060a..e88f12ee46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,6 @@ SUBDIRS = \
 	src \
 	dispatcher \
 	clients \
-	tools \
 	data \
 	po \
 	man \
@@ -1776,6 +1775,14 @@ EXTRA_DIST += \
 	shared/nm-utils/unaligned.h \
 	shared/nm-version-macros.h.in \
 	\
+	tools/check-exports.sh \
+	tools/create-exports-NetworkManager.sh \
+	tools/debug-helper.py \
+	tools/run-nm-test.sh \
+	tools/test-networkmanager-service.py \
+	tools/test-sudo-wrapper.sh \
+	tools/enums-to-docbook.pl \
+	\
 	$(NULL)
 
 BUILT_SOURCES += \
diff --git a/configure.ac b/configure.ac
index a565695064..cb2d5f03f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1170,7 +1170,6 @@ libnm-glib/Makefile
 libnm-glib/tests/Makefile
 dispatcher/Makefile
 dispatcher/tests/Makefile
-tools/Makefile
 clients/Makefile
 clients/cli/Makefile
 clients/tui/Makefile
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index c2b3912775..0000000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTRA_DIST = \
-	check-exports.sh \
-	create-exports-NetworkManager.sh \
-	debug-helper.py \
-	run-nm-test.sh \
-	test-networkmanager-service.py \
-	test-sudo-wrapper.sh \
-	enums-to-docbook.pl