From 321691d89a216cdd77befbb81657170273bc6baf Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 7 Dec 2016 12:27:54 +0800
Subject: [PATCH] cmake: turn krbd into a static lib

* simplify the link dependencies.
* s/keyutils/${KEYUTILS_LIBRARIES}/

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/CMakeLists.txt             | 18 ++++++++----------
 src/test/CMakeLists.txt        |  1 -
 src/test/bench/CMakeLists.txt  |  2 --
 src/test/librbd/CMakeLists.txt |  5 +----
 src/tools/rbd/CMakeLists.txt   |  6 ++----
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c145db07e06c2..3edae48b9d087 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -629,14 +629,10 @@ endif(${WITH_RADOSGW})
 if(WITH_RBD)
   set(DENCODER_EXTRALIBS
     ${DENCODER_EXTRALIBS}
-    rbd_types
     cls_rbd_client
-    rbd_replay_types
-    keyutils
-    udev)
-  list(APPEND dencoder_srcs
-    $<TARGET_OBJECTS:krbd_objs>
-    $<TARGET_OBJECTS:parse_secret_objs>)
+    krbd
+    rbd_types
+    rbd_replay_types)
 endif(WITH_RBD)
 
 add_executable(ceph-dencoder ${dencoder_srcs})
@@ -819,8 +815,8 @@ add_subdirectory(bash_completion)
 if(WITH_LIBCEPHFS OR WITH_RBD)
   set(parse_secret_files
     common/secret.c)
-  add_library(parse_secret_objs OBJECT ${parse_secret_files})
 endif()
+add_library(parse_secret_objs OBJECT ${parse_secret_files})
 
 if(WITH_LIBCEPHFS)
   add_subdirectory(client)
@@ -853,7 +849,7 @@ if(WITH_LIBCEPHFS)
   add_executable(mount.ceph ${mount_ceph_srcs}
     $<TARGET_OBJECTS:parse_secret_objs>
     $<TARGET_OBJECTS:common_mountcephfs_objs>)
-  target_link_libraries(mount.ceph keyutils)
+  target_link_libraries(mount.ceph ${KEYUTILS_LIBRARIES})
 
   install(TARGETS ceph-syn DESTINATION bin)
   install(TARGETS mount.ceph DESTINATION ${CMAKE_INSTALL_SBINDIR})
@@ -873,7 +869,9 @@ endif(WITH_LIBCEPHFS)
 add_subdirectory(journal)
 
 if(${WITH_RBD})
-  add_library(krbd_objs OBJECT krbd.cc)
+  add_library(krbd STATIC krbd.cc
+    $<TARGET_OBJECTS:parse_secret_objs>)
+  target_link_libraries(krbd ${KEYUTILS_LIBRARIES} ${UDEV_LIBRARIES})
   add_subdirectory(librbd)
   if(WITH_FUSE)
     add_subdirectory(rbd_fuse)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index dad63293fa1d3..6da47db6ee80a 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -841,7 +841,6 @@ target_link_libraries(unittest_rbd_replay
   global
   rbd_replay
   rbd_replay_ios
-  keyutils
   ${BLKID_LIBRARIES}
   )
 endif(WITH_RBD)
diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
index 6773ad1e487a8..ce4357fa7d0b5 100644
--- a/src/test/bench/CMakeLists.txt
+++ b/src/test/bench/CMakeLists.txt
@@ -28,10 +28,8 @@ if(WITH_RBD)
     os
     global
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    udev
     ${BLKID_LIBRARIES}
     ${CMAKE_DL_LIBS}
-    keyutils
     )
   add_dependencies(ceph_smalliobenchrbd
     cls_rbd
diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index eab069ba73ff9..df7fd41cce470 100644
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -118,22 +118,19 @@ set_target_properties(ceph_test_librbd_api PROPERTIES COMPILE_FLAGS
 
 add_executable(ceph_test_librbd_fsx
   fsx.cc
-  $<TARGET_OBJECTS:krbd_objs>
   $<TARGET_OBJECTS:common_texttable_obj>
-  $<TARGET_OBJECTS:parse_secret_objs>
   )
 target_link_libraries(ceph_test_librbd_fsx
   librbd
   librados
   journal
+  krbd
   global
   m
   ${CMAKE_DL_LIBS}
   ${CRYPTO_LIBS}
   ${EXTRALIBS}
   blkid
-  udev
-  keyutils
   )
 
 install(TARGETS
diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt
index 42d3a5d0e5b32..cc96fb8f604e5 100644
--- a/src/tools/rbd/CMakeLists.txt
+++ b/src/tools/rbd/CMakeLists.txt
@@ -38,16 +38,14 @@ set(rbd_srcs
   action/Watch.cc)
 add_executable(rbd ${rbd_srcs}
   $<TARGET_OBJECTS:common_util_obj>
-  $<TARGET_OBJECTS:parse_secret_objs>
-  $<TARGET_OBJECTS:common_texttable_obj>
-  $<TARGET_OBJECTS:krbd_objs>)
+  $<TARGET_OBJECTS:common_texttable_obj>)
 set_target_properties(rbd PROPERTIES OUTPUT_NAME rbd)
 target_link_libraries(rbd librbd librados
   cls_journal_client cls_rbd_client
+  krbd
   rbd_types
   journal
   common global
-  keyutils udev
   ${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 install(TARGETS rbd DESTINATION bin)
-- 
2.39.5