]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: do not link libmon with mon_common_objs 15376/head
authorKefu Chai <kchai@redhat.com>
Wed, 14 Jun 2017 03:38:53 +0000 (11:38 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 14 Jun 2017 15:53:50 +0000 (23:53 +0800)
ceph-common includes them already.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/CMakeLists.txt
src/mon/CMakeLists.txt

index 668a43af8b2da3e82146318d1310da6c75aadb47..3db9348b8514064130ab5e46203c3c11d131fd22 100644 (file)
@@ -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
index 06196415d7056e3f299919b60ef73c6131547c90..9e40ef58863caa0f70df56e073dc45587cae4723 100644 (file)
@@ -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})