]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #7284 from ceph/wip-make-remove-libedit
authorLoic Dachary <loic@dachary.org>
Mon, 25 Jan 2016 06:15:48 +0000 (13:15 +0700)
committerLoic Dachary <loic@dachary.org>
Mon, 25 Jan 2016 06:15:48 +0000 (13:15 +0700)
makefile: remove libedit from libclient.la

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
CMakeLists.txt
ceph.spec.in
configure.ac
src/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
diff --cc ceph.spec.in
Simple merge
diff --cc configure.ac
Simple merge
index 1be14fbc7fee558d2d707bed4c2b05b5fe541d8d,0b9a8e497282c9fc2ed42d9d73ea508107fbe181..1340d33f01d21566c996e4bc58fb83b4663f379f
@@@ -901,15 -895,9 +895,15 @@@ if(WITH_LIBCEPHFS
      client/Trace.cc
      client/posix_acl.cc)
    add_library(client ${libclient_srcs})
-   target_link_libraries(client osdc mds ${LIBEDIT_LIBS})
+   target_link_libraries(client osdc mds)
    set(libcephfs_srcs libcephfs.cc)
 -  add_library(cephfs SHARED ${libcephfs_srcs})
 +  add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs}
 +    $<TARGET_OBJECTS:cls_references_objs>
 +    $<TARGET_OBJECTS:heap_profiler_objs>
 +    $<TARGET_OBJECTS:common_util_obj>)
 +  target_link_libraries(cephfs PRIVATE client osdc osd os global common cls_lock_client
 +    ${BLKID_LIBRARIES}
 +    ${CRYPTO_LIBS} ${EXTRALIBS} ${TCMALLOC_LIBS})
  if(${ENABLE_SHARED})
    set_target_properties(cephfs PROPERTIES OUTPUT_NAME cephfs VERSION 1.0.0
      SOVERSION 1)