Move test-dbus to tests/dbus/, and add an empty tests/tools/

20071127142435-53eee-b2168fae55be61f04ae54e0139771da9ff266bfe.gz

7 files changed, 34 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 05ba4c97f..ad7a9cb8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,6 +203,8 @@ AC_OUTPUT( Makefile \
 	   telepathy-glib/Makefile \
 	   telepathy-glib/telepathy-glib.pc \
 	   tests/Makefile \
+	   tests/dbus/Makefile \
+	   tests/tools/Makefile \
 	   tools/Makefile \
 	   m4/Makefile \
 )
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6910edf8a..0fcfc86cc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,9 @@
+SUBDIRS = \
+    . \
+    dbus \
+    tools
+
 noinst_PROGRAMS = \
-    test-dbus \
     test-handle-set \
     test-heap \
     test-intset \
@@ -8,11 +12,6 @@ noinst_PROGRAMS = \
 
 TESTS = $(noinst_PROGRAMS)
 
-test_dbus_SOURCES = \
-    test-dbus.c
-test_dbus_LDADD = \
-    ../telepathy-glib/libtelepathy-glib-internal.la
-
 test_handle_set_SOURCES = \
     test-intset.c
 test_handle_set_LDADD = \
@@ -43,7 +42,9 @@ test_internal_debug_LDADD = \
 check_c_sources = *.c
 include $(top_srcdir)/tools/check-coding-style.mk
 
-AM_CFLAGS = $(ERROR_CFLAGS) @DBUS_CFLAGS@ @GLIB_CFLAGS@ @COVERAGE_CFLAGS@ -I.. -I$(srcdir)/..
-AM_LDFLAGS = @DBUS_LIBS@ @GLIB_LIBS@
-
-TESTS_ENVIRONMENT = sh $(top_srcdir)/tools/with-session-bus.sh --session --
+AM_CFLAGS = \
+    $(ERROR_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(GLIB_CFLAGS) \
+    $(COVERAGE_CFLAGS) \
+    $(TP_GLIB_CFLAGS)
diff --git a/tests/dbus/.git-darcs-dir b/tests/dbus/.git-darcs-dir
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/dbus/.git-darcs-dir
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
new file mode 100644
index 000000000..7b5a706a3
--- /dev/null
+++ b/tests/dbus/Makefile.am
@@ -0,0 +1,21 @@
+noinst_PROGRAMS = \
+    test-dbus
+
+TESTS = $(noinst_PROGRAMS)
+
+test_dbus_SOURCES = \
+    test-dbus.c
+test_dbus_LDADD = \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
+
+check_c_sources = *.c
+include $(top_srcdir)/tools/check-coding-style.mk
+
+AM_CFLAGS = \
+    $(ERROR_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(GLIB_CFLAGS) \
+    $(COVERAGE_CFLAGS) \
+    $(TP_GLIB_CFLAGS)
+
+TESTS_ENVIRONMENT = sh $(top_srcdir)/tools/with-session-bus.sh --session --
diff --git a/tests/test-dbus.c b/tests/dbus/test-dbus.c
index 8b14fdb01..8b14fdb01 100644
--- a/tests/test-dbus.c
+++ b/tests/dbus/test-dbus.c
diff --git a/tests/tools/.git-darcs-dir b/tests/tools/.git-darcs-dir
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/tools/.git-darcs-dir
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/tools/Makefile.am