Merge branch 'alex'

[nbd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d909a2b..8c51576 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,29 @@
-bin_PROGRAMS = nbd-server
+SUBDIRS = man
+bin_PROGRAMS = nbd-server nbd-trdump
+sbin_PROGRAMS = @NBD_CLIENT_NAME@
 EXTRA_PROGRAMS = nbd-client knbd-client
 TESTS_ENVIRONMENT=$(srcdir)/simple_test
-TESTS = cmd cfg1 cfgmulti
+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@
 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 simple_test INSTALL
-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
-       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
+EXTRA_DIST = gznbd simple_test integrity-test.tr maketr
 dist-hook:
        rm -Rf `find $(distdir) -name '.svn' -type d -print`
 cmd:
 cfg1:
 cfgmulti:
+cfgnew:
+cfgsize:
+write:
+flush:
+integrity:
+