From: Alex Bligh <alex@alex.org.uk>
Date: Sat, 28 May 2011 20:39:45 +0000 (+0100)
Subject: Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
X-Git-Url: http://git.alex.org.uk

Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd
---

79c640f51c12b8f58a7e4e8dc9af1ab230156429
diff --cc Makefile.am
index f6b8b8d,8c51576..15807c3
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,9 -1,9 +1,9 @@@
  SUBDIRS = man
- bin_PROGRAMS = nbd-server
+ bin_PROGRAMS = nbd-server nbd-trdump
  sbin_PROGRAMS = @NBD_CLIENT_NAME@
- EXTRA_PROGRAMS = nbd-client knbd-client nbd-trdump
+ EXTRA_PROGRAMS = nbd-client knbd-client
  TESTS_ENVIRONMENT=$(srcdir)/simple_test
 -TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity
 +TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity integrityhuge
  check_PROGRAMS = nbd-tester-client
  knbd_client_SOURCES = nbd-client.c cliserv.h
  nbd_client_SOURCES = nbd-client.c cliserv.h