]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/Makefile.am: Populate DENCODER_SOURCES properly
authorBoris Ranto <branto@redhat.com>
Mon, 13 Apr 2015 10:33:00 +0000 (12:33 +0200)
committerKen Dreyer <kdreyer@redhat.com>
Thu, 16 Apr 2015 16:14:38 +0000 (10:14 -0600)
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 <branto@redhat.com>
src/rgw/Makefile.am

index 17dc2d117888f625344809ead2641d5a008c49a5..316ae7620ce537a753eeb917b072d7d26db5938e 100644 (file)
@@ -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 \