From: Kefu Chai <kchai@redhat.com>
Date: Wed, 14 Jun 2017 03:38:53 +0000 (+0800)
Subject: cmake: do not link libmon with mon_common_objs
X-Git-Tag: v12.1.0~146^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15376%2Fhead;p=ceph.git

cmake: do not link libmon with mon_common_objs

ceph-common includes them already.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 668a43af8b2d..3db9348b8514 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -576,11 +576,6 @@ if(WITH_LTTNG AND WITH_EVENTTRACE)
   list(APPEND libcommon_files common/EventTrace.cc)
 endif()
 
-set(mon_common_files
-  auth/AuthSessionHandler.cc
-  auth/cephx/CephxSessionHandler.cc
-  erasure-code/ErasureCodePlugin.cc)
-add_library(mon_common_objs OBJECT ${mon_common_files})
 set(common_mountcephfs_files
   common/armor.c
   common/safe_io.c
diff --git a/src/mon/CMakeLists.txt b/src/mon/CMakeLists.txt
index 06196415d705..9e40ef58863c 100644
--- a/src/mon/CMakeLists.txt
+++ b/src/mon/CMakeLists.txt
@@ -22,7 +22,6 @@ set(lib_mon_srcs
   ConfigKeyService.cc)
 add_library(mon STATIC
   ${lib_mon_srcs}
-  $<TARGET_OBJECTS:mon_common_objs>
   $<TARGET_OBJECTS:kv_objs>
   $<TARGET_OBJECTS:heap_profiler_objs>)
 target_link_libraries(mon ${ALLOC_LIBS})