]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
updated common library linked objects
authorRohan Mars <code@rohanmars.com>
Tue, 27 Oct 2015 04:01:59 +0000 (21:01 -0700)
committerRohan Mars <code@rohanmars.com>
Fri, 13 Nov 2015 01:30:49 +0000 (17:30 -0800)
src/common/Makefile.am

index ac47b3396a79a3bcb6915303e5164ee971b166a1..782cfa1f0841d7a8461cf70c2e39f74710d3b9fd 100644 (file)
@@ -26,7 +26,6 @@ libcommon_internal_la_SOURCES = \
        common/MemoryModel.cc \
        common/armor.c \
        common/fd.cc \
-       common/xattr.c \
        common/safe_io.c \
        common/snap_types.cc \
        common/str_list.cc \
@@ -57,10 +56,6 @@ libcommon_internal_la_SOURCES = \
        common/entity_name.cc \
        common/ceph_crypto.cc \
        common/ceph_crypto_cms.cc \
-       common/ceph_json.cc \
-       common/ipaddr.cc \
-       common/pick_address.cc \
-       common/util.cc \
        common/TextTable.cc \
        common/ceph_fs.cc \
        common/ceph_hash.cc \
@@ -69,17 +64,32 @@ libcommon_internal_la_SOURCES = \
        common/addr_parsing.c \
        common/hobject.cc \
        common/bloom_filter.cc \
-       common/linux_version.c \
        common/module.c \
        common/Readahead.cc \
        common/Cycles.cc \
        common/ContextCompletion.cc \
        common/TracepointProvider.cc
 
+if ENABLE_SERVER
+libcommon_internal_la_SOURCES += \
+       common/xattr.c \
+       common/ipaddr.cc \
+       common/ceph_json.cc \
+       common/util.cc \
+       common/pick_address.cc
+endif
+
+if LINUX
+libcommon_internal_la_SOURCES += \
+       common/linux_version.c 
+endif
+
 if WITH_RBD
+if LINUX
 libcommon_internal_la_SOURCES += \
        common/blkdev.cc
 endif
+endif
 
 if ENABLE_XIO
 libcommon_internal_la_SOURCES += \