-nbd_server_SOURCES = nbd-server.c cliserv.h
-man1_MANS = nbd-server.1
-man8_MANS = nbd-client.8
-EXTRA_DIST = 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-client.8: nbd-client.8.sgml
- docbook-to-man nbd-client.8.sgml > nbd-client.8
+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@
+nbd_tester_client_LDADD = @GLIB_LIBS@
+make_integrityhuge_SOURCES = make-integrityhuge.c cliserv.h nbd.h
+EXTRA_DIST = gznbd simple_test integrity-test.tr integrityhuge-test.tr maketr