From: Sage Weil <sage@inktank.com>
Date: Fri, 20 Sep 2013 04:03:36 +0000 (-0700)
Subject: Makefile: add extra cls DENCODER_DEPS in the cls makefile, not rgw
X-Git-Tag: v0.71~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0681971e62ccd5b09c0876c767fa6d64ea2a5daf;p=ceph.git

Makefile: add extra cls DENCODER_DEPS in the cls makefile, not rgw

They belong next to the class.  Also, if rgw isn't built, ceph-dencoder
will fail to link.

Fixes: #6352
Tested-by: Haomai Wang <haomaiwang@gmail.com>
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/cls/Makefile.am b/src/cls/Makefile.am
index 0c04c64faa77..2d3d43cb1e36 100644
--- a/src/cls/Makefile.am
+++ b/src/cls/Makefile.am
@@ -59,11 +59,13 @@ libcls_lock_client_la_SOURCES = \
 	cls/lock/cls_lock_types.cc \
 	cls/lock/cls_lock_ops.cc
 noinst_LTLIBRARIES += libcls_lock_client.la
+DENCODER_DEPS += libcls_lock_client.la
 
 libcls_refcount_client_la_SOURCES = \
 	cls/refcount/cls_refcount_client.cc \
 	cls/refcount/cls_refcount_ops.cc
 noinst_LTLIBRARIES += libcls_refcount_client.la
+DENCODER_DEPS += libcls_refcount_client.la
 
 libcls_version_client_a_SOURCES =  \
 	cls/version/cls_version_client.cc \
@@ -81,12 +83,14 @@ libcls_replica_log_client_a_SOURCES = \
 	cls/replica_log/cls_replica_log_ops.cc \
 	cls/replica_log/cls_replica_log_client.cc
 noinst_LIBRARIES += libcls_replica_log_client.a
+DENCODER_DEPS += libcls_replica_log_client.a
 
 libcls_rgw_client_la_SOURCES = \
 	cls/rgw/cls_rgw_client.cc \
 	cls/rgw/cls_rgw_types.cc \
 	cls/rgw/cls_rgw_ops.cc
 noinst_LTLIBRARIES += libcls_rgw_client.la
+DENCODER_DEPS += libcls_rgw_client.la
 
 libcls_rbd_client_la_SOURCES = cls/rbd/cls_rbd_client.cc
 noinst_LTLIBRARIES += libcls_rbd_client.la
diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index b812d9085696..24060b52e25a 100644
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -93,11 +93,6 @@ DENCODER_SOURCES += \
 	rgw/rgw_common.cc \
 	rgw/rgw_env.cc \
 	rgw/rgw_json_enc.cc
-DENCODER_DEPS +=  \
-	libcls_lock_client.la \
-	libcls_rgw_client.la \
-	libcls_replica_log_client.a \
-	libcls_refcount_client.la
 
 
 endif # WITH_RADOSGW