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

diff --git a/Makefile.am b/Makefile.am
index f1d24ad..d909a2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,9 @@
 bin_PROGRAMS = nbd-server
-EXTRA_PROGRAMS = nbd-client
-TESTS = $(srcdir)/simple_test
+EXTRA_PROGRAMS = nbd-client knbd-client
+TESTS_ENVIRONMENT=$(srcdir)/simple_test
+TESTS = cmd cfg1 cfgmulti
 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_tester_client_SOURCES = nbd-tester-client.c cliserv.h
@@ -10,7 +12,7 @@ nbd_tester_client_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 nbd_server_LDADD = @GLIB_LIBS@
 nbd_tester_client_LDADD = @GLIB_LIBS@
 man_MANS = nbd-server.1 nbd-server.5 nbd-client.8
-EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml nbd-server.5.sgml gznbd winnbd lfs.h nbd-client.8 CodingStyle
+EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml nbd-server.5.sgml gznbd winnbd lfs.h nbd-client.8 CodingStyle simple_test INSTALL
 MAINTAINERCLEANFILES = nbd-client.8 nbd-server.1
 nbd-server.1.in: nbd-server.1.sgml
 	docbook2man nbd-server.1.sgml
@@ -23,3 +25,6 @@ nbd-server.5.in: nbd-server.5.sgml
 	mv NBD-SERVER.5 nbd-server.5.in
 dist-hook:
 	rm -Rf `find $(distdir) -name '.svn' -type d -print`
+cmd:
+cfg1:
+cfgmulti: