Merge branch 'alex'

[nbd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3c63f59..8c51576 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,29 @@
-bin_PROGRAMS = nbd-server
-EXTRA_PROGRAMS = nbd-client
+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 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@
-man1_MANS = nbd-server.1
-man8_MANS = nbd-client.8
-EXTRA_DIST = nbd-client.8.sgml nbd-server.1.sgml gznbd winnbd lfs.h
-CLEANFILES = 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_tester_client_LDADD = @GLIB_LIBS@
+EXTRA_DIST = gznbd simple_test integrity-test.tr maketr
 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:
+