From: Rohan Mars <code@rohanmars.com>
Date: Tue, 27 Oct 2015 04:01:59 +0000 (-0700)
Subject: updated common library linked objects
X-Git-Tag: v10.0.1~63^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a1b9f9ac9ada1b6961d99259025977b62249ab0;p=ceph.git

updated common library linked objects
---

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index ac47b3396a79..782cfa1f0841 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -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 += \