From 0b264331f57b64880ce05fe3bd752e8df226d00c Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Mon, 13 Apr 2015 12:33:00 +0200 Subject: [PATCH] rgw/Makefile.am: Populate DENCODER_SOURCES properly Dencoder is built if ENABLE_CLIENT is set. However, the rgw/Makefile.am populated DENCODER_SOURCES only if WITH_RADOSGW was set. The patch fixes this and populates DENCODER_SOURES if ENABLE_CLIENT is set. Signed-off-by: Boris Ranto --- src/rgw/Makefile.am | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am index 17dc2d117888f..316ae7620ce53 100644 --- a/src/rgw/Makefile.am +++ b/src/rgw/Makefile.am @@ -1,4 +1,13 @@ if ENABLE_CLIENT + +# inject rgw stuff in the decoder testcase +DENCODER_SOURCES += \ + rgw/rgw_dencoder.cc \ + rgw/rgw_acl.cc \ + rgw/rgw_common.cc \ + rgw/rgw_env.cc \ + rgw/rgw_json_enc.cc + if WITH_RADOS if WITH_RADOSGW @@ -107,14 +116,6 @@ ceph_rgw_jsonparser_SOURCES = \ ceph_rgw_jsonparser_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_rgw_jsonparser -# inject rgw stuff in the decoder testcase -DENCODER_SOURCES += \ - rgw/rgw_dencoder.cc \ - rgw/rgw_acl.cc \ - rgw/rgw_common.cc \ - rgw/rgw_env.cc \ - rgw/rgw_json_enc.cc - noinst_HEADERS += \ rgw/logrotate.conf \ -- 2.39.5