From ddeb43840f8b64f9df02dcf58eacc1cd17848e0f Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Thu, 1 Jun 2017 10:26:50 +0800
Subject: [PATCH] cmake: move common/util.cc into ceph-common

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/CMakeLists.txt           | 11 +++--------
 src/mds/CMakeLists.txt       |  3 +--
 src/mon/CMakeLists.txt       |  1 -
 src/osd/CMakeLists.txt       |  3 +--
 src/test/mds/CMakeLists.txt  |  1 -
 src/tools/rbd/CMakeLists.txt |  1 -
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b19d00d779de0..668a43af8b2da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -534,6 +534,7 @@ set(libcommon_files
   common/fs_types.cc
   common/dns_resolve.cc
   common/hostname.cc
+  common/util.cc
   arch/probe.cc
   ${auth_files}
   ${mds_files})
@@ -769,10 +770,6 @@ target_link_libraries(ceph-dencoder
 install(TARGETS ceph-dencoder DESTINATION bin)
 
 # Monitor
-set(common_util_src
-  common/util.cc)
-add_library(common_util_obj OBJECT ${common_util_src})
-
 add_subdirectory(mon)
 set(ceph_mon_srcs
   ceph_mon.cc)
@@ -857,8 +854,7 @@ add_subdirectory(osd)
 
 set(ceph_osd_srcs
   ceph_osd.cc)
-add_executable(ceph-osd ${ceph_osd_srcs}
-  $<TARGET_OBJECTS:common_util_obj>)
+add_executable(ceph-osd ${ceph_osd_srcs})
 add_dependencies(ceph-osd erasure_code_plugins)
 target_link_libraries(ceph-osd osd os global-static common
   ${BLKID_LIBRARIES} ${RDMA_LIBRARIES})
@@ -870,8 +866,7 @@ install(TARGETS ceph-osd DESTINATION bin)
 add_subdirectory(mds)
 set(ceph_mds_srcs
   ceph_mds.cc)
-add_executable(ceph-mds ${ceph_mds_srcs}
-  $<TARGET_OBJECTS:common_util_obj>)
+add_executable(ceph-mds ${ceph_mds_srcs})
 target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
   Boost::thread)
 install(TARGETS ceph-mds DESTINATION bin)
diff --git a/src/mds/CMakeLists.txt b/src/mds/CMakeLists.txt
index b7f7d0c51154c..aa3b9705a6e00 100644
--- a/src/mds/CMakeLists.txt
+++ b/src/mds/CMakeLists.txt
@@ -39,6 +39,5 @@ set(mds_srcs
   ${CMAKE_SOURCE_DIR}/src/common/TrackedOp.cc
   ${CMAKE_SOURCE_DIR}/src/osdc/Journaler.cc)
 add_library(mds STATIC ${mds_srcs}
-  $<TARGET_OBJECTS:heap_profiler_objs>
-  $<TARGET_OBJECTS:common_util_obj>)
+  $<TARGET_OBJECTS:heap_profiler_objs>)
 target_link_libraries(mds ${ALLOC_LIBS} osdc liblua)
diff --git a/src/mon/CMakeLists.txt b/src/mon/CMakeLists.txt
index 3b91b069e2447..06196415d7056 100644
--- a/src/mon/CMakeLists.txt
+++ b/src/mon/CMakeLists.txt
@@ -24,6 +24,5 @@ add_library(mon STATIC
   ${lib_mon_srcs}
   $<TARGET_OBJECTS:mon_common_objs>
   $<TARGET_OBJECTS:kv_objs>
-  $<TARGET_OBJECTS:common_util_obj>
   $<TARGET_OBJECTS:heap_profiler_objs>)
 target_link_libraries(mon ${ALLOC_LIBS})
diff --git a/src/osd/CMakeLists.txt b/src/osd/CMakeLists.txt
index 28897f8b0140f..670223b6cf4e1 100644
--- a/src/osd/CMakeLists.txt
+++ b/src/osd/CMakeLists.txt
@@ -39,8 +39,7 @@ endif()
 add_library(osd STATIC ${osd_srcs}
   $<TARGET_OBJECTS:cls_references_objs>
   $<TARGET_OBJECTS:global_common_objs>
-  $<TARGET_OBJECTS:heap_profiler_objs>
-  $<TARGET_OBJECTS:common_util_obj>)
+  $<TARGET_OBJECTS:heap_profiler_objs>)
 target_link_libraries(osd ${LEVELDB_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
 if(WITH_LTTNG)
   add_dependencies(osd osd-tp pg-tp)
diff --git a/src/test/mds/CMakeLists.txt b/src/test/mds/CMakeLists.txt
index 24c678e608108..b4d0be301f5d3 100644
--- a/src/test/mds/CMakeLists.txt
+++ b/src/test/mds/CMakeLists.txt
@@ -9,7 +9,6 @@ target_link_libraries(unittest_mds_authcap mds global ${BLKID_LIBRARIES})
 # unittest_mds_sessionfilter
 add_executable(unittest_mds_sessionfilter
   TestSessionFilter.cc
-  $<TARGET_OBJECTS:common_util_obj>
   $<TARGET_OBJECTS:unit-main>
   )
 add_ceph_unittest(unittest_mds_sessionfilter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_mds_sessionfilter)
diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
index c0264b61f8c62..8774b4902813b 100644
--- a/src/tools/rbd/CMakeLists.txt
+++ b/src/tools/rbd/CMakeLists.txt
@@ -36,7 +36,6 @@ set(rbd_srcs
   action/Trash.cc
   action/Watch.cc)
 add_executable(rbd ${rbd_srcs}
-  $<TARGET_OBJECTS:common_util_obj>
   $<TARGET_OBJECTS:common_texttable_obj>)
 set_target_properties(rbd PROPERTIES OUTPUT_NAME rbd)
 target_link_libraries(rbd librbd librados
-- 
2.39.5