X-Git-Url: http://git.alex.org.uk

diff --git a/Makefile.am b/Makefile.am
index b869c69..bded5a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,29 @@
+SUBDIRS = man
 bin_PROGRAMS = nbd-server
-EXTRA_PROGRAMS = nbd-client
+sbin_PROGRAMS = @NBD_CLIENT_NAME@
+EXTRA_PROGRAMS = nbd-client knbd-client nbd-trdump
+TESTS_ENVIRONMENT=$(srcdir)/simple_test
+TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity
+check_PROGRAMS = nbd-tester-client
+knbd_client_SOURCES = nbd-client.c cliserv.h
 nbd_client_SOURCES = nbd-client.c cliserv.h
-nbd_server_SOURCES = nbd-server.c cliserv.h
+nbd_server_SOURCES = nbd-server.c cliserv.h lfs.h nbd.h
+nbd_tester_client_SOURCES = nbd-tester-client.c cliserv.h
+nbd_trdump_SOURCES = nbd-trdump.c cliserv.h nbd.h
 nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+nbd_tester_client_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+nbd_trdump_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 nbd_server_LDADD = @GLIB_LIBS@
-man_MANS = nbd-server.1 nbd-client.8
-EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml gznbd winnbd lfs.h nbd-client.8 nbd-server.1
-MAINTAINERCLEANFILES = nbd-client.8 nbd-server.1
-nbd-server.1: nbd-server.1.sgml
-	docbook2man nbd-server.1.sgml
-	mv NBD-SERVER.1 nbd-server.1
-nbd-client.8: nbd-client.8.sgml
-	docbook2man nbd-client.8.sgml
-	mv NBD-CLIENT.8 nbd-client.8
+nbd_tester_client_LDADD = @GLIB_LIBS@
+EXTRA_DIST = gznbd simple_test
 dist-hook:
-	rm -Rf `find $(distdir) -name 'CVS' -type d -print`
+	rm -Rf `find $(distdir) -name '.svn' -type d -print`
+cmd:
+cfg1:
+cfgmulti:
+cfgnew:
+cfgsize:
+write:
+flush:
+integrity:
+