build: don't link to libuuid

we have already moved to use boost uuid implementation

Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 166cdc9b9a55e578289a54016bb4e6844ef238fe..98fdb01f46795b394ff42b58ff9785dfe5cee6f7 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -257,8 +257,6 @@ if ENABLE_COVERAGE
 EXTRALIBS += -lgcov
 endif # ENABLE_COVERAGE
 
-LIBCOMMON += -luuid
-
 # Libosd always needs osdc and os
 LIBOSD += $(LIBOSDC) $(LIBOS)
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index df7c350ad009f23797391896ba39e58e30c440f3..a2848f0a4ef26b764a7e6f0bbfdb74c13f12f42a 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -174,8 +174,7 @@ LIBCOMMON_DEPS += \
        $(LIBMSG) $(LIBAUTH) \
        $(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \
        $(BOOST_RANDOM_LIBS) \
-       $(RESOLV_LIBS) \
-       -luuid
+       $(RESOLV_LIBS)
 
 if LINUX
 LIBCOMMON_DEPS += -lrt -lblkid

diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am
index ef6378169dcc49cdabdaeb0ff4a4bfa61f2ec82e..f2d7a71d5be4e82440025b80b200d2a197a8fd4f 100644 (file)
--- a/src/test/Makefile-client.am
+++ b/src/test/Makefile-client.am
@@ -205,7 +205,7 @@ bin_DEBUGPROGRAMS += ceph_test_cls_numops
 ceph_test_cls_journal_SOURCES = test/cls_journal/test_cls_journal.cc
 ceph_test_cls_journal_LDADD = \
         libcls_journal_client.la $(LIBRADOS) \
-        $(LIBCOMMON) $(CRYPTO_LIBS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) -luuid
+        $(LIBCOMMON) $(CRYPTO_LIBS) $(UNITTEST_LDADD) $(RADOS_TEST_LDADD)
 ceph_test_cls_journal_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 bin_DEBUGPROGRAMS += ceph_test_cls_journal
 
@@ -706,7 +706,7 @@ ceph_test_rgw_obj_SOURCES = test/rgw/test_rgw_obj.cc
 ceph_test_rgw_obj_LDADD = \
        $(LIBRADOS) $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) \
        $(UNITTEST_LDADD) $(CRYPTO_LIBS) \
-       -lcurl -luuid -lexpat
+       -lcurl -lexpat
 
 ceph_test_rgw_obj_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 bin_DEBUGPROGRAMS += ceph_test_rgw_obj