test/librbd: decouple ceph_test_librbd_api from libceph-common

Fixes: http://tracker.ceph.com/issues/20175
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b7287fdc4d70c5ecedda78ae367b98e5d8f61c5b)

Conflicts: master has switched from autotools to cmake, so this is
  somewhat an equivalent in automake to the cherry-picked change on
  CMakeLists.txt

diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am
index e6da00305f69d186a52235beedd30b124149b5e2..63f6db000851fb973c7d08aa51f873aef66f784a 100644 (file)
--- a/src/test/Makefile-client.am
+++ b/src/test/Makefile-client.am
@@ -441,10 +441,11 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
 ceph_test_librbd_api_SOURCES = \
        test/librbd/test_support.cc \
        test/librbd/test_librbd.cc \
-       test/librbd/test_main.cc
+       test/librbd/test_main.cc \
+       test/librados/test.cc
 ceph_test_librbd_api_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 ceph_test_librbd_api_LDADD = \
-       $(LIBRBD) $(LIBRADOS) $(LIBCOMMON) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD)
+       $(LIBRBD) $(LIBRADOS) $(UNITTEST_LDADD)
 bin_DEBUGPROGRAMS += ceph_test_librbd_api
 
 noinst_HEADERS += \