-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/src @BOOST_CPPFLAGS@ @CPPUNIT_CFLAGS@
METASOURCES = AUTO
-bin_PROGRAMS = client server
-client_SOURCES = client.cpp
-client_LDADD = $(top_builddir)/src/libt2n.la
-server_LDADD = $(top_builddir)/src/libt2n.la
-server_SOURCES = server.cpp
+check_PROGRAMS = test
+
+test_LDADD = $(top_builddir)/src/libt2n.la @BOOST_SERIALIZATION_LIB@ \
+ @BOOST_LDFLAGS@ @CPPUNIT_LIBS@
+test_SOURCES = test.cpp comm.cpp simplecmd.cpp callback.cpp hello.cpp \
+ timeout.cpp serialize.cpp cmdgroup.cpp
+
+TESTS = test