[gnome-chess/chess-telepathy-networking-support-664946-communicate: 7/10] Organize tests

[Chandni Verma <vchandni src gnome org>]

commit e9c24beb3d51663bf2d27c4ff903b9dd047ab3ce
Author: Chandni Verma <chandniverma2112 gmail com>
Date:   Fri Dec 28 08:16:22 2012 +0530

    Organize tests

 tests/Makefile.am |   32 +++++++++-----------------------
 1 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58db1ea..b210d4f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,53 +6,39 @@ AM_CFLAGS = \
 	$(GNOME_CHESS_CFLAGS)
 
 LDADD = \
-	$(top_builddir)/libgames-contacts/libgames-contacts.la \
-	$(GNOME_CHESS_LIBS)
-
-test_demo_gdbus_server_CFLAGS = \
-	$(GNOME_CHESS_CFLAGS)
-
-test_demo_gdbus_server_LDADD = \
-	$(GNOME_CHESS_LIBS)
-
-test_demo_gdbus_client_CFLAGS = \
-	$(GNOME_CHESS_CFLAGS)
-
-test_demo_gdbus_client_LDADD = \
 	$(GNOME_CHESS_LIBS)
 
-test_demo_gdbus_server_VALAFLAGS = \
-	--pkg gio-2.0
-
-test_demo_gdbus_client_VALAFLAGS = \
-	--pkg gio-2.0
-
-networking_tests = \
+telepathy_networking_tests = \
 	test-fetch-contacts \
 	offerer \
 	accepter
 
-vala_tests = \
+plain_tests = \
 	test-demo-gdbus-client \
 	test-demo-gdbus-server
 
 noinst_PROGRAMS = \
-	$(vala_tests)
+	$(plain_tests)
 
 if ENABLE_NETWORKING
 noinst_PROGRAMS += \
-	$(networking_tests)
+	$(telepathy_networking_tests)
 
 AM_CFLAGS += \
 	$(GEE_CFLAGS) \
 	$(TELEPATHY_CFLAGS) \
 	$(GIO_CFLAGS)
 LDADD += \
+	$(top_builddir)/libgames-contacts/libgames-contacts.la \
 	$(GEE_LIBS) \
 	$(TELEPATHY_LIBS) \
 	$(GIO_LIBS)
+
+VALAFLAGS = \
+	--pkg gio-2.0
 endif #ENABLE_NETWORKING
 
+
 test_fetch_contacts_SOURCES = test-fetch-contacts.c
 
 test_demo_gdbus_server_SOURCES = test-demo-gdbus-server.vala