librados: revert librados3/libradoscc back to librados2

For backwards compatibility and upgrade reasons, the librados2
API needs to be preserved and it needs to continue to be compatible
with dependent libraries like librbd1.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

31 files changed, 58 insertions, 87 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 25df4fe882f..1b1f19d464e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -397,7 +397,7 @@ add_library(ceph-common SHARED ${ceph_common_objs})
 target_link_libraries(ceph-common ${ceph_common_deps})
 # appease dpkg-shlibdeps
 set_target_properties(ceph-common PROPERTIES
-  SOVERSION 1
+  SOVERSION 0
   INSTALL_RPATH "")
 if(NOT APPLE AND NOT FREEBSD)
   # Apple uses Mach-O, not ELF. so this option does not apply to APPLE.
diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt
index c2f68f648c1..c4df7531094 100644
--- a/src/librados/CMakeLists.txt
+++ b/src/librados/CMakeLists.txt
@@ -10,17 +10,16 @@ add_library(rados_c_api OBJECT
   librados_c.cc)
 add_library(rados_cxx_api OBJECT
   librados_cxx.cc)
-add_library(rados_cxx STATIC
-  $<TARGET_OBJECTS:rados_cxx_api>)
 if(WITH_LTTNG)
   add_dependencies(librados_impl librados-tp)
   add_dependencies(rados_c_api librados-tp)
   add_dependencies(rados_cxx_api librados-tp)
 endif()
 
-# C API
+# C/C++ API
 add_library(librados ${CEPH_SHARED}
-  $<TARGET_OBJECTS:rados_c_api>)
+  $<TARGET_OBJECTS:rados_c_api>
+  $<TARGET_OBJECTS:rados_cxx_api>)
 if(ENABLE_SHARED)
   set_target_properties(librados PROPERTIES
     OUTPUT_NAME rados
@@ -39,34 +38,11 @@ if(ENABLE_SHARED)
 endif()
 
 target_link_libraries(librados PRIVATE
-  rados_cxx librados_impl
-  osdc ceph-common cls_lock_client
+  librados_impl osdc ceph-common cls_lock_client
   ${BLKID_LIBRARIES} ${CRYPTO_LIBS} ${EXTRALIBS} ${GSSAPI_LIBRARIES})
 target_link_libraries(librados ${rados_libs})
 install(TARGETS librados DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-# C++ API
-add_library(librados-cxx ${CEPH_SHARED}
-  $<TARGET_OBJECTS:rados_cxx_api>)
-if(ENABLE_SHARED)
-  set_target_properties(librados-cxx PROPERTIES
-    OUTPUT_NAME radospp
-    VERSION 1.0.0
-    SOVERSION 1
-    CXX_VISIBILITY_PRESET hidden
-    VISIBILITY_INLINES_HIDDEN ON)
-  if(NOT APPLE)
-    set_property(TARGET librados-cxx APPEND_STRING PROPERTY
-      LINK_FLAGS " -Wl,--exclude-libs,ALL")
-  endif()
-endif(ENABLE_SHARED)
-target_link_libraries(librados-cxx
-  PUBLIC
-    librados
-  PRIVATE
-    librados_impl cls_lock_client ceph-common)
-install(TARGETS librados-cxx DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
 if(WITH_LTTNG AND WITH_EVENTTRACE)
   add_dependencies(librados_api_obj eventtrace_tp)
 endif()
diff --git a/src/libradosstriper/CMakeLists.txt b/src/libradosstriper/CMakeLists.txt
index d9d022f675f..a69192465d5 100644
--- a/src/libradosstriper/CMakeLists.txt
+++ b/src/libradosstriper/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(radosstriper ${CEPH_SHARED}
   ${libradosstriper_srcs})
 target_link_libraries(radosstriper
   PRIVATE
-    librados-cxx
+    librados
     librados_impl cls_lock_client osdc ceph-common
     pthread ${CRYPTO_LIBS} ${EXTRALIBS})
 set_target_properties(radosstriper PROPERTIES
diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
index e7da59cf267..061238a94be 100644
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@ -162,7 +162,7 @@ target_link_libraries(librbd PRIVATE
   rbd_internal
   rbd_types
   journal
-  librados-cxx
+  librados
   cls_rbd_client 
   cls_lock_client 
   cls_journal_client 
diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
index 5ffae423be4..e9d3804c5f5 100644
--- a/src/rbd_replay/CMakeLists.txt
+++ b/src/rbd_replay/CMakeLists.txt
@@ -10,7 +10,7 @@ set(librbd_replay_srcs
     rbd_loc.cc
     Replayer.cc)
 add_library(rbd_replay STATIC ${librbd_replay_srcs})
-target_link_libraries(rbd_replay PRIVATE librbd librados-cxx global)
+target_link_libraries(rbd_replay PRIVATE librbd librados global)
 
 add_executable(rbd-replay
   rbd-replay.cc)
diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 7e3b1662393..d0e508d8aa9 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -197,7 +197,7 @@ target_include_directories(rgw_a SYSTEM PUBLIC "../rapidjson/include")
 target_link_libraries(rgw_a
   PUBLIC dmclock::dmclock
   PRIVATE
-  librados-cxx cls_otp_client cls_lock_client cls_rgw_client cls_refcount_client
+  librados cls_otp_client cls_lock_client cls_rgw_client cls_refcount_client
   cls_log_client cls_timeindex_client cls_version_client
   cls_user_client ceph-common common_utf8 global
   ${CURL_LIBRARIES}
@@ -327,7 +327,7 @@ add_library(rgw_admin_user SHARED
 add_dependencies(rgw_admin_user civetweb_h)
 
 target_link_libraries(rgw_admin_user PRIVATE
-  librados-cxx
+  librados
   cls_rgw_client
   cls_otp_client
   cls_lock_client
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index fbc45c6daf5..bd11aee0aec 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -133,7 +133,7 @@ target_link_libraries(ceph_bench_log global pthread rt ${BLKID_LIBRARIES} ${CMAK
 add_executable(ceph_test_mutate
   test_mutate.cc
   )
-target_link_libraries(ceph_test_mutate global librados-cxx ${BLKID_LIBRARIES} 
+target_link_libraries(ceph_test_mutate global librados ${BLKID_LIBRARIES} 
   ${CMAKE_DL_LIBS})
 
 # test_trans
@@ -153,7 +153,7 @@ add_executable(ceph_omapbench
   ${omapbench_srcs}
   )
 target_link_libraries(ceph_omapbench
-  librados-cxx
+  librados
   Boost::program_options
   global
   ${BLKID_LIBRARIES}
@@ -167,7 +167,7 @@ if(WITH_KVS)
     ${CMAKE_SOURCE_DIR}/src/key_value_store/kv_flat_btree_async.cc
     )
   add_executable(ceph_kvstorebench ${kvstorebench_srcs})
-  target_link_libraries(ceph_kvstorebench librados-cxx global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+  target_link_libraries(ceph_kvstorebench librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
   install(TARGETS ceph_kvstorebench DESTINATION bin)
 endif(WITH_KVS)
 
@@ -359,7 +359,7 @@ endif(${WITH_RADOSGW})
 add_executable(ceph_multi_stress_watch
   multi_stress_watch.cc
   )
-target_link_libraries(ceph_multi_stress_watch librados-cxx global radostest-cxx
+target_link_libraries(ceph_multi_stress_watch librados global radostest-cxx
   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 #ceph_perf_local
@@ -421,7 +421,7 @@ add_executable(ceph_test_stress_watch
   test_stress_watch.cc
   )
 target_link_libraries(ceph_test_stress_watch
-  librados-cxx
+  librados
   ${UNITTEST_LIBS}
   radostest-cxx
   ${EXTRALIBS}
diff --git a/src/test/cls_hello/CMakeLists.txt b/src/test/cls_hello/CMakeLists.txt
index 1363d746b6a..9efb95e0309 100644
--- a/src/test/cls_hello/CMakeLists.txt
+++ b/src/test/cls_hello/CMakeLists.txt
@@ -2,7 +2,7 @@ add_executable(ceph_test_cls_hello
   test_cls_hello.cc
   )
 target_link_libraries(ceph_test_cls_hello
-  librados-cxx
+  librados
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
diff --git a/src/test/cls_journal/CMakeLists.txt b/src/test/cls_journal/CMakeLists.txt
index 08d47655a79..eeb943330f9 100644
--- a/src/test/cls_journal/CMakeLists.txt
+++ b/src/test/cls_journal/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(ceph_test_cls_journal
   $<TARGET_OBJECTS:common_texttable_obj>)
 target_link_libraries(ceph_test_cls_journal
   cls_journal_client
-  librados-cxx
+  librados
   global
   ${UNITTEST_LIBS}
   ${CMAKE_DL_LIBS}
diff --git a/src/test/cls_lock/CMakeLists.txt b/src/test/cls_lock/CMakeLists.txt
index 53f36725c56..eef2de40edc 100644
--- a/src/test/cls_lock/CMakeLists.txt
+++ b/src/test/cls_lock/CMakeLists.txt
@@ -3,7 +3,7 @@ add_executable(ceph_test_cls_lock
   )
 target_link_libraries(ceph_test_cls_lock
   cls_lock_client
-  librados-cxx
+  librados
   global
   ${UNITTEST_LIBS}
   ${BLKID_LIBRARIES}
diff --git a/src/test/cls_log/CMakeLists.txt b/src/test/cls_log/CMakeLists.txt
index c27d9843a1c..b5a88d47c17 100644
--- a/src/test/cls_log/CMakeLists.txt
+++ b/src/test/cls_log/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable(ceph_test_cls_log
   test_cls_log.cc)
 target_link_libraries(ceph_test_cls_log
-  librados-cxx
+  librados
   cls_log_client
   global
   radostest-cxx
diff --git a/src/test/cls_lua/CMakeLists.txt b/src/test/cls_lua/CMakeLists.txt
index cfb6ba1171b..a16fb6226d6 100644
--- a/src/test/cls_lua/CMakeLists.txt
+++ b/src/test/cls_lua/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(ceph_test_cls_lua
 target_link_libraries(ceph_test_cls_lua
   cls_lua_client
   liblua
-  librados-cxx
+  librados
   global
   ${UNITTEST_LIBS}
   ${EXTRALIBS}
diff --git a/src/test/cls_numops/CMakeLists.txt b/src/test/cls_numops/CMakeLists.txt
index 00108991d39..827ff606f98 100644
--- a/src/test/cls_numops/CMakeLists.txt
+++ b/src/test/cls_numops/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_executable(ceph_test_cls_numops 
   test_cls_numops.cc)
 target_link_libraries(ceph_test_cls_numops 
-  librados-cxx
+  librados
   global
   cls_numops_client 
   ${EXTRALIBS}
diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt
index d42deb08848..59a75b030f4 100644
--- a/src/test/cls_rbd/CMakeLists.txt
+++ b/src/test/cls_rbd/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(ceph_test_cls_rbd
 target_link_libraries(ceph_test_cls_rbd
   cls_rbd_client
   cls_lock_client
-  librados-cxx
+  librados
   global
   ${UNITTEST_LIBS}
   ${CMAKE_DL_LIBS}
diff --git a/src/test/cls_refcount/CMakeLists.txt b/src/test/cls_refcount/CMakeLists.txt
index e9aaeaa6a25..c8589bdb5a1 100644
--- a/src/test/cls_refcount/CMakeLists.txt
+++ b/src/test/cls_refcount/CMakeLists.txt
@@ -3,7 +3,7 @@ add_executable(ceph_test_cls_refcount
   test_cls_refcount.cc
   )
 target_link_libraries(ceph_test_cls_refcount
-  librados-cxx
+  librados
   cls_refcount_client
   global
   ${UNITTEST_LIBS}
diff --git a/src/test/cls_rgw/CMakeLists.txt b/src/test/cls_rgw/CMakeLists.txt
index 79409db53b7..32d73e26e16 100644
--- a/src/test/cls_rgw/CMakeLists.txt
+++ b/src/test/cls_rgw/CMakeLists.txt
@@ -4,7 +4,7 @@ if(${WITH_RADOSGW})
     )
   target_link_libraries(ceph_test_cls_rgw
     cls_rgw_client
-    librados-cxx
+    librados
     global
     ${UNITTEST_LIBS}
     ${EXTRALIBS}
diff --git a/src/test/cls_sdk/CMakeLists.txt b/src/test/cls_sdk/CMakeLists.txt
index cd05900d56f..68085af28e8 100644
--- a/src/test/cls_sdk/CMakeLists.txt
+++ b/src/test/cls_sdk/CMakeLists.txt
@@ -2,7 +2,7 @@ add_executable(ceph_test_cls_sdk
   test_cls_sdk.cc
   )
 target_link_libraries(ceph_test_cls_sdk
-  librados-cxx
+  librados
   global
   ${EXTRALIBS}
   ${BLKID_LIBRARIES}
diff --git a/src/test/cls_version/CMakeLists.txt b/src/test/cls_version/CMakeLists.txt
index d8e43878d69..05264017b73 100644
--- a/src/test/cls_version/CMakeLists.txt
+++ b/src/test/cls_version/CMakeLists.txt
@@ -3,7 +3,7 @@ add_executable(ceph_test_cls_version
   test_cls_version.cc
   )
 target_link_libraries(ceph_test_cls_version
-  librados-cxx
+  librados
   cls_version_client
   global
   ${UNITTEST_LIBS}
diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
index e4b3011d3ff..4fc53d24066 100644
--- a/src/test/librados/CMakeLists.txt
+++ b/src/test/librados/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(ceph_test_rados_api_cmd
 add_executable(ceph_test_rados_api_cmd_pp
   cmd_cxx.cc)
 target_link_libraries(ceph_test_rados_api_cmd_pp
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_io
   io.cc)
@@ -37,7 +37,7 @@ target_link_libraries(ceph_test_rados_api_io
 add_executable(ceph_test_rados_api_io_pp
   io_cxx.cc)
 target_link_libraries(ceph_test_rados_api_io_pp
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_c_write_operations
   c_write_operations.cc)
@@ -56,11 +56,11 @@ target_link_libraries(ceph_test_rados_api_aio
 add_executable(ceph_test_rados_api_aio_pp
   aio_cxx.cc)
 target_link_libraries(ceph_test_rados_api_aio_pp
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_asio asio.cc)
 target_link_libraries(ceph_test_rados_api_asio global
-  librados-cxx ${UNITTEST_LIBS})
+  librados ${UNITTEST_LIBS})
 if(WITH_BOOST_CONTEXT)
   target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
 endif()
@@ -83,7 +83,7 @@ target_link_libraries(ceph_test_rados_api_stat
 add_executable(ceph_test_rados_api_stat_pp
   stat_cxx.cc)
 target_link_libraries(ceph_test_rados_api_stat_pp
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_watch_notify
   watch_notify.cc)
@@ -92,12 +92,12 @@ target_link_libraries(ceph_test_rados_api_watch_notify
 add_executable(ceph_test_rados_api_watch_notify_pp
   watch_notify_cxx.cc)
 target_link_libraries(ceph_test_rados_api_watch_notify_pp
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_cls
   cls.cc)
 target_link_libraries(ceph_test_rados_api_cls
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_misc
   misc.cc
@@ -108,7 +108,7 @@ add_executable(ceph_test_rados_api_misc_pp
   misc_cxx.cc
   $<TARGET_OBJECTS:unit-main>)
 target_link_libraries(ceph_test_rados_api_misc_pp
-  librados-cxx global ${UNITTEST_LIBS} radostest-cxx)
+  librados global ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_lock
   lock.cc)
@@ -117,7 +117,7 @@ target_link_libraries(ceph_test_rados_api_lock
 add_executable(ceph_test_rados_api_lock_pp
   lock_cxx.cc)
 target_link_libraries(ceph_test_rados_api_lock_pp
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_service
   service.cc)
@@ -126,13 +126,13 @@ target_link_libraries(ceph_test_rados_api_service
 add_executable(ceph_test_rados_api_service_pp
   service_cxx.cc)
 target_link_libraries(ceph_test_rados_api_service_pp
-  librados-cxx global ${UNITTEST_LIBS} radostest-cxx)
+  librados global ${UNITTEST_LIBS} radostest-cxx)
 
 add_executable(ceph_test_rados_api_tier_pp
   tier_cxx.cc
   $<TARGET_OBJECTS:unit-main>)
 target_link_libraries(ceph_test_rados_api_tier_pp
-  librados-cxx global ${UNITTEST_LIBS} Boost::system radostest-cxx)
+  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
 
 add_executable(ceph_test_rados_api_snapshots
   snapshots.cc)
@@ -141,7 +141,7 @@ target_link_libraries(ceph_test_rados_api_snapshots
 add_executable(ceph_test_rados_api_snapshots_pp
   snapshots_cxx.cc)
 target_link_libraries(ceph_test_rados_api_snapshots_pp
-  librados-cxx ${UNITTEST_LIBS} radostest-cxx)
+  librados ${UNITTEST_LIBS} radostest-cxx)
 
 install(TARGETS
   ceph_test_rados_api_aio
diff --git a/src/test/librados/list.cc b/src/test/librados/list.cc
index 3ee9ae24bab..c66cec35135 100644
--- a/src/test/librados/list.cc
+++ b/src/test/librados/list.cc
@@ -169,7 +169,7 @@ TEST_F(LibRadosList, ListObjectsStart) {
 
 // this function replicates
 // librados::operator<<(std::ostream& os, const librados::ObjectCursor& oc)
-// because we don't want to use librados-cxx in librados client.
+// because we don't want to use librados in librados client.
 std::ostream& operator<<(std::ostream&os, const rados_object_list_cursor& oc)
 {
   if (oc) {
diff --git a/src/test/librados/test_shared.h b/src/test/librados/test_shared.h
index 29e23b471ca..3c8ce7ed88f 100644
--- a/src/test/librados/test_shared.h
+++ b/src/test/librados/test_shared.h
@@ -11,7 +11,7 @@
 
 #include "include/buffer_fwd.h"
 
-// helpers shared by librados and librados-cxx tests
+// helpers shared by librados tests
 std::string get_temp_pool_name(const std::string &prefix = "test-rados-api-");
 void assert_eq_sparse(ceph::bufferlist& expected,
                       const std::map<uint64_t, uint64_t>& extents,
diff --git a/src/test/libradosstriper/CMakeLists.txt b/src/test/libradosstriper/CMakeLists.txt
index 14de7ca83b1..8e53a300ae1 100644
--- a/src/test/libradosstriper/CMakeLists.txt
+++ b/src/test/libradosstriper/CMakeLists.txt
@@ -13,8 +13,7 @@ add_executable(ceph_test_rados_striper_api_striping
 target_link_libraries(ceph_test_rados_striper_api_striping
   ${UNITTEST_LIBS} rados_striper_test
   radosstriper
-  librados
-  librados-cxx)
+  librados)
 install(TARGETS ceph_test_rados_striper_api_striping
   DESTINATION ${CMAKE_INSTALL_BINDIR})
 
@@ -23,14 +22,13 @@ add_executable(ceph_test_rados_striper_api_io
 target_link_libraries(ceph_test_rados_striper_api_io
   ${UNITTEST_LIBS} rados_striper_test
   radosstriper
-  librados
-  librados-cxx)
+  librados)
 install(TARGETS ceph_test_rados_striper_api_io
   DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(ceph_test_rados_striper_api_aio
   aio.cc)
-target_link_libraries(ceph_test_rados_striper_api_aio librados-cxx radosstriper
+target_link_libraries(ceph_test_rados_striper_api_aio librados radosstriper
   ${UNITTEST_LIBS} rados_striper_test)
 install(TARGETS ceph_test_rados_striper_api_aio
   DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index 53570db5263..9d9f6c3118e 100644
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -138,7 +138,6 @@ target_link_libraries(ceph_test_librbd
   cls_journal_client
   cls_rbd_client
   librados
-  librados-cxx
   ${UNITTEST_LIBS}
   radostest)
 target_compile_definitions(ceph_test_librbd PRIVATE "TEST_LIBRBD_INTERNALS")
@@ -154,7 +153,6 @@ target_link_libraries(ceph_test_librbd_api
   radostest-cxx
   librbd
   librados
-  librados-cxx
   ${UNITTEST_LIBS})
 
 add_executable(ceph_test_librbd_fsx
@@ -164,7 +162,6 @@ add_executable(ceph_test_librbd_fsx
 target_link_libraries(ceph_test_librbd_fsx
   librbd
   librados
-  librados-cxx
   journal
   global
   m
diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt
index 565a82064dc..64639d5ec8e 100644
--- a/src/test/osd/CMakeLists.txt
+++ b/src/test/osd/CMakeLists.txt
@@ -6,7 +6,7 @@ add_executable(ceph_test_rados
   RadosModel.cc
   )
 target_link_libraries(ceph_test_rados
-  librados-cxx
+  librados
   global
   ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS}
diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
index 5a528c39552..2af8680b2f2 100644
--- a/src/test/rbd_mirror/CMakeLists.txt
+++ b/src/test/rbd_mirror/CMakeLists.txt
@@ -61,7 +61,7 @@ target_link_libraries(unittest_rbd_mirror
   cls_lock_client
   cls_journal_client
   rbd_types
-  librados-cxx
+  librados
   osdc
   global
   radostest-cxx
@@ -81,7 +81,7 @@ target_link_libraries(ceph_test_rbd_mirror
   cls_rbd_client
   cls_journal_client
   rbd_types
-  librados-cxx
+  librados
   radostest-cxx
   ${UNITTEST_LIBS}
   )
@@ -89,7 +89,7 @@ target_link_libraries(ceph_test_rbd_mirror
 add_executable(ceph_test_rbd_mirror_random_write
   random_write.cc)
 target_link_libraries(ceph_test_rbd_mirror_random_write
-  librbd librados-cxx global)
+  librbd librados global)
 
 install(TARGETS
   ceph_test_rbd_mirror
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index a799a6c96f1..42b72560c1e 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -8,7 +8,7 @@ set(rados_srcs
   ${PROJECT_SOURCE_DIR}/src/osd/ECUtil.cc)
 add_executable(rados ${rados_srcs})
 
-target_link_libraries(rados librados-cxx global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+target_link_libraries(rados librados global ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 if(WITH_LIBRADOSSTRIPER)
   target_link_libraries(rados radosstriper)
 else()
@@ -22,11 +22,11 @@ target_link_libraries(ceph_scratchtool librados global)
 install(TARGETS ceph_scratchtool DESTINATION bin)
 
 add_executable(ceph_scratchtoolpp scratchtoolpp.cc)
-target_link_libraries(ceph_scratchtoolpp librados-cxx global)
+target_link_libraries(ceph_scratchtoolpp librados global)
 install(TARGETS ceph_scratchtoolpp DESTINATION bin)
 
 add_executable(ceph_radosacl radosacl.cc)
-target_link_libraries(ceph_radosacl librados-cxx global)
+target_link_libraries(ceph_radosacl librados global)
 install(TARGETS ceph_radosacl DESTINATION bin)
 
 install(PROGRAMS
@@ -102,7 +102,7 @@ install(TARGETS ceph-authtool DESTINATION bin)
 
 set(cephdeduptool_srcs ceph_dedup_tool.cc)
 add_executable(cephdeduptool ${cephdeduptool_srcs})
-target_link_libraries(cephdeduptool librados-cxx global cls_cas_client)
+target_link_libraries(cephdeduptool librados global cls_cas_client)
 install(TARGETS cephdeduptool DESTINATION bin)
 
 if(WITH_CEPHFS)
diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt
index dbfc74e6a33..2cca8dc034c 100644
--- a/src/tools/cephfs/CMakeLists.txt
+++ b/src/tools/cephfs/CMakeLists.txt
@@ -9,7 +9,7 @@ set(cephfs_journal_tool_srcs
   RoleSelector.cc
   MDSUtility.cc)
 add_executable(cephfs-journal-tool ${cephfs_journal_tool_srcs})
-target_link_libraries(cephfs-journal-tool librados-cxx mds osdc global
+target_link_libraries(cephfs-journal-tool librados mds osdc global
   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 set(cephfs_table_tool_srcs
@@ -18,7 +18,7 @@ set(cephfs_table_tool_srcs
   RoleSelector.cc
   MDSUtility.cc)
 add_executable(cephfs-table-tool ${cephfs_table_tool_srcs})
-target_link_libraries(cephfs-table-tool librados-cxx mds osdc global
+target_link_libraries(cephfs-table-tool librados mds osdc global
   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
 set(cephfs_data_scan_srcs
@@ -28,7 +28,7 @@ set(cephfs_data_scan_srcs
   PgFiles.cc
   MDSUtility.cc)
 add_executable(cephfs-data-scan ${cephfs_data_scan_srcs})
-target_link_libraries(cephfs-data-scan librados-cxx cephfs mds osdc global
+target_link_libraries(cephfs-data-scan librados cephfs mds osdc global
   cls_cephfs_client
   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
index eaebbc8f114..36b2408a8d2 100644
--- a/src/tools/rbd/CMakeLists.txt
+++ b/src/tools/rbd/CMakeLists.txt
@@ -48,7 +48,7 @@ set(rbd_srcs
 add_executable(rbd ${rbd_srcs}
   $<TARGET_OBJECTS:common_texttable_obj>)
 set_target_properties(rbd PROPERTIES OUTPUT_NAME rbd)
-target_link_libraries(rbd librbd librados-cxx
+target_link_libraries(rbd librbd librados
   cls_journal_client cls_rbd_client
   rbd_types
   journal
diff --git a/src/tools/rbd_ggate/CMakeLists.txt b/src/tools/rbd_ggate/CMakeLists.txt
index fcd341c2a67..5c5572c48fe 100644
--- a/src/tools/rbd_ggate/CMakeLists.txt
+++ b/src/tools/rbd_ggate/CMakeLists.txt
@@ -5,5 +5,5 @@ add_executable(rbd-ggate
   debug.cc
   ggate_drv.c
   main.cc)
-target_link_libraries(rbd-ggate geom librbd librados-cxx global)
+target_link_libraries(rbd-ggate geom librbd librados global)
 install(TARGETS rbd-ggate DESTINATION bin)
diff --git a/src/tools/rbd_mirror/CMakeLists.txt b/src/tools/rbd_mirror/CMakeLists.txt
index 1ad8ad34af3..fb39f9c5221 100644
--- a/src/tools/rbd_mirror/CMakeLists.txt
+++ b/src/tools/rbd_mirror/CMakeLists.txt
@@ -59,7 +59,7 @@ target_link_libraries(rbd-mirror
   rbd_internal
   rbd_types
   journal
-  librados-cxx
+  librados
   osdc
   cls_rbd_client
   cls_lock_client
diff --git a/src/tools/rbd_nbd/CMakeLists.txt b/src/tools/rbd_nbd/CMakeLists.txt
index 73ea9913786..d7ce811e963 100644
--- a/src/tools/rbd_nbd/CMakeLists.txt
+++ b/src/tools/rbd_nbd/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable(rbd-nbd rbd-nbd.cc)
-target_link_libraries(rbd-nbd librbd librados-cxx global)
+target_link_libraries(rbd-nbd librbd librados global)
 install(TARGETS rbd-nbd DESTINATION bin)