From d044180af13bc8b2798a89f1280017755f4a8260 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Fri, 10 Sep 2010 11:30:28 +0100
Subject: [PATCH] Move tools/manager-file.py to tests/tools/manager-file.py

It belongs with the test tools, since it's only useful for the Telepathy test
rig.
---
 tests/lib/telepathy/contactlist/Makefile.am | 4 ++--
 tests/tools/Makefile.am                     | 5 ++++-
 {tools => tests/tools}/manager-file.py      | 0
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename {tools => tests/tools}/manager-file.py (100%)

diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
index 84eb4ca..8efc4a0 100644
--- a/tests/lib/telepathy/contactlist/Makefile.am
+++ b/tests/lib/telepathy/contactlist/Makefile.am
@@ -34,9 +34,9 @@ libtp_test_contactlist_la_CFLAGS = $(TP_GLIB_CFLAGS)
 libtp_test_contactlist_la_LIBADD = $(TP_GLIB_LIBS)
 
 _gen/tp_test_contact_list.manager _gen/param-spec-struct.h: \
-			manager-file.py $(top_srcdir)/tools/manager-file.py
+			manager-file.py $(top_srcdir)/tests/tools/manager-file.py
 		$(AM_V_at)$(mkdir_p) _gen
-		$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/manager-file.py \
+		$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tests/tools/manager-file.py \
 			$(srcdir)/manager-file.py _gen
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index 822301a..bb36dd2 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,3 +1,6 @@
-EXTRA_DIST = with-session-bus.sh
+EXTRA_DIST = \
+	with-session-bus.sh \
+	manager-file.py \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/tools/manager-file.py b/tests/tools/manager-file.py
similarity index 100%
rename from tools/manager-file.py
rename to tests/tools/manager-file.py
-- 
2.7.4