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

diff --git a/Makefile.am b/Makefile.am
index 51ee6c0..f1d24ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,25 @@
 bin_PROGRAMS = nbd-server
 EXTRA_PROGRAMS = nbd-client
+TESTS = $(srcdir)/simple_test
+check_PROGRAMS = nbd-tester-client
 nbd_client_SOURCES = nbd-client.c cliserv.h
 nbd_server_SOURCES = nbd-server.c cliserv.h
-man1_MANS = nbd-server.1
-man8_MANS = nbd-client.8
-EXTRA_DIST = nbd.h nbd-client.8.sgml nbd-server.1.sgml gznbd winnbd
-DISTCLEANFILES = nbd-client.8 nbd-server.1
-nbd-server.1: nbd-server.1.sgml
-	docbook-to-man nbd-server.1.sgml > nbd-server.1
+nbd_tester_client_SOURCES = nbd-tester-client.c cliserv.h
+nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+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
+MAINTAINERCLEANFILES = nbd-client.8 nbd-server.1
+nbd-server.1.in: nbd-server.1.sgml
+	docbook2man nbd-server.1.sgml
+	mv NBD-SERVER.1 nbd-server.1.in
 nbd-client.8: nbd-client.8.sgml
-	docbook-to-man nbd-client.8.sgml > nbd-client.8
+	docbook2man nbd-client.8.sgml
+	mv NBD-CLIENT.8 nbd-client.8
+nbd-server.5.in: nbd-server.5.sgml
+	docbook2man nbd-server.5.sgml
+	mv NBD-SERVER.5 nbd-server.5.in
 dist-hook:
-	rm -Rf `find $(distdir) -name 'CVS' -type d -print`
+	rm -Rf `find $(distdir) -name '.svn' -type d -print`